ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,402 Commits 6 Branches 42 Tags 64 MiB
15b90579ae
Commit Graph

7402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GabrielMeyer
376f4e2a31 Implements a mechanism for a fallback theme 
- If the previously selected theme is not available the default OpenSlides theme will be displayed.
- Before the current selected theme was loaded, no theme is displayed.
 2019-05-07 17:32:28 +02:00
Emanuel Schütze
8bc7f8cb70
Merge pull request #4630 from MaximilianKrambach/assignment_globalno 
include global abstain/no option
 2019-05-07 17:30:43 +02:00
Emanuel Schütze
5d64ea1519
Merge pull request #4668 from GabrielInTheWorld/fixes-checkbox 
Fixes state of the checkboxes in amendments
 2019-05-07 17:25:09 +02:00
Emanuel Schütze
67b99c1baa
Merge pull request #4665 from GabrielInTheWorld/utilities 
Fixes scrollbar in old firefox versions
 2019-05-07 17:18:51 +02:00
Emanuel Schütze
38d572b34f
Merge pull request #4670 from FinnStutzenstein/fixMotionBlockSlide 
Fix motion block slide
 2019-05-07 17:14:01 +02:00
Finn Stutzenstein
82a2189b04
Merge pull request #4666 from FinnStutzenstein/operatorService 
Proper updating of the viewUser in the OperatorService
 2019-05-07 16:39:52 +02:00
FinnStutzenstein
02d82e20c1 websocket logging 2019-05-07 16:37:38 +02:00
Emanuel Schütze
95161d5dea
Merge pull request #4654 from GabrielInTheWorld/util-fixes 
Some fields are only available if they are available
 2019-05-07 16:25:39 +02:00
FinnStutzenstein
72a7a6fde0 Fix motion block slide 2019-05-07 16:18:13 +02:00
FinnStutzenstein
f53d3c2069 Fix numbering with amendments 2019-05-07 16:12:47 +02:00
GabrielMeyer
41e2fb2f93 Fixes scrollbar in old firefox versions 2019-05-07 16:04:18 +02:00
GabrielMeyer
e6c4e1d27b Fixes state of the checkboxes in amendments 2019-05-07 15:58:36 +02:00
FinnStutzenstein
afb28f0f72 Proper updating of the viewUser in the OperatorService 2019-05-07 15:54:14 +02:00
GabrielMeyer
3d5f79a76c Fields are only available if they are available 
- The user can change information about motions
- The user can send an invitation email
 2019-05-07 15:03:57 +02:00
Finn Stutzenstein
c560f511b5
Merge pull request #4607 from FinnStutzenstein/prioritizeClients 
Prioritize clients and WS ping-pong-mechanism
 2019-05-07 14:04:09 +02:00
Emanuel Schütze
17dbcca757
Merge pull request #4664 from emanuelschuetze/motionBlockPermission 
Fixed motion block permission
 2019-05-07 13:54:36 +02:00
FinnStutzenstein
febbe9bba2 Prioritize clients with the right operator and added ping-pong mechanism 2019-05-07 13:43:52 +02:00
Emanuel Schütze
41c30eb730 Fixed motion block permission 2019-05-07 13:27:42 +02:00
Emanuel Schütze
d218a86f69
Merge pull request #4662 from FinnStutzenstein/repoSpeed 
Speedup DS and repo updates, DSUpdateSlots, lazyloading history objects
 2019-05-07 13:26:21 +02:00
Emanuel Schütze
a3bf5481ed
Merge pull request #4663 from GabrielInTheWorld/sorting 
Fixes the listing of motions in a category
 2019-05-07 12:47:20 +02:00
GabrielMeyer
11c565282f Fixes the listing of motions in a category 
- Sorting by motion.category_weight
 2019-05-07 12:26:25 +02:00
Emanuel Schütze
179ef39aca
Merge pull request #4661 from tsiegleauq/pdf-comment-paragraph 
Fix Parsing for personal comments in bulk export
 2019-05-06 16:59:49 +02:00
FinnStutzenstein
fe81ea6ff9 Speedup DS and repo updates, DSUpdateSlots, lazyloading history objects 2019-05-06 16:33:36 +02:00
Emanuel Schütze
801010a936
Merge pull request #4655 from MaximilianKrambach/weight 
fix sorting in category-sort
 2019-05-06 16:25:36 +02:00
Sean Engelhardt
0f7733a25d Fix Parsing for personal comments in bulk export 
Fixes an error where HTML in motion comments was parsed
wrong during PDF bulk export
 2019-05-06 16:22:35 +02:00
Sean
e1b8e74e8d
Merge pull request #4657 from tsiegleauq/service-worker-addons 
Service Worker Updates
 2019-05-06 13:59:07 +02:00
Sean Engelhardt
e4d3e119d3 Service Worker Updates 
Introdcues a new update service.
Listens to service-worker updates and shows a snack-bar to inform about updates.
Provides a function to manually check for updates.

The service worker tries to be consistent in it's own version and
updates in the background.
Some manuall trigger will be required to update, which is either a
reload or the execution of the provded check function

with help from
@FinnStutzenstein
 2019-05-06 13:13:09 +02:00
Finn Stutzenstein
8fb12a6882
Merge pull request #4658 from FinnStutzenstein/fixUserSlide 
Fixed user slide
 2019-05-04 12:13:57 +02:00
FinnStutzenstein
cc931bc8bf Fixed user slide 2019-05-04 08:35:54 +02:00
Maximilian Krambach
52c6e05aba fix sorting in category-sort 2019-05-02 11:45:49 +02:00
Maximilian Krambach
f00303d753 include global abstain/no option 
election polls with 'one vote per candidate' should have a
 global no/abstain option
 2019-05-02 10:51:00 +02:00
Emanuel Schütze
d7c6583b7e
Merge pull request #4647 from GabrielInTheWorld/extend-user-dialog 
Adds the structure-level and participant-number to the user-list
 2019-04-30 16:39:49 +02:00
Emanuel Schütze
9f5226c1d9
Merge pull request #4648 from FinnStutzenstein/motionBlockSlideTwoColumns 
Dynamic a two column layout in motion block slides
 2019-04-30 16:38:58 +02:00
Sean
addc0cc3cc
Merge pull request #4653 from GabrielInTheWorld/sorting 
Save motion category weight, handle auto update in categories
 2019-04-30 16:18:48 +02:00
GabrielMeyer
33044a6eaa Handles 'auto-update' 
- New motions in a category are appended to the end of the list.
- Removed motions are extracted from the list of motions.
 2019-04-30 15:48:22 +02:00
Sean
524ff4a981
Merge pull request #4652 from FinnStutzenstein/sortMotionInCategories 
Sort motions in categories
 2019-04-30 14:28:09 +02:00
FinnStutzenstein
76880100f5 Sort motions in categories 2019-04-30 14:14:41 +02:00
Sean
83044acde5
Merge pull request #4650 from tsiegleauq/xlsx-addons 
Add various extensions to the xlsx exporter
 2019-04-30 10:55:46 +02:00
Sean Engelhardt
d05a30bccb Add various extensions to the xlsx exporter 2019-04-30 10:34:01 +02:00
Emanuel Schütze
4507840788
Merge pull request #4646 from FinnStutzenstein/resetClientCache 
Added button to reset the clients cache
 2019-04-30 10:24:19 +02:00
Emanuel Schütze
bccd9db076
Merge pull request #4649 from tsiegleauq/pdf-font-size-parsing 
use ParseInt in PDF generation
 2019-04-29 19:54:18 +02:00
Sean Engelhardt
945b2ce72a use ParseInt in PDF generation 
Replace "+"(string) with parseInt(val, 10), since apparently some editors
copy `style="xy.zpt"` into a style tag
 2019-04-29 12:43:22 +02:00
Sean
3dd659ae36
Merge pull request #4636 from FinnStutzenstein/assignmentAttachments 
Add attachments to assignments
 2019-04-29 11:35:39 +02:00
FinnStutzenstein
ec7a7aadae Added button to reset the clients cache 2019-04-29 11:27:35 +02:00
FinnStutzenstein
c234cfe698 Dynamic a two column layout in motion block slides 2019-04-29 11:20:12 +02:00
GabrielMeyer
8b489fcdc0 Adds the structure-level to the user-list 
- The dialog shows the structure level of one user
- In the list-view the structure level and the participant number are displayed.
 2019-04-29 10:35:24 +02:00
FinnStutzenstein
44b683e361 Add attachments to assignments 2019-04-29 10:31:28 +02:00
Emanuel Schütze
29aa6acdc5
Merge pull request #4574 from ostcar/new_django_version 
Update django and other dependencys
 2019-04-29 08:58:39 +02:00
FinnStutzenstein
1b15f6ea14 prohibit changes in projectiondefaults 
resolves question in #4541
 2019-04-29 08:25:49 +02:00
Oskar Hahn
65161cbbf8 Update django and other dependencys 2019-04-28 14:03:11 +02:00