ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,028 Commits 6 Branches 42 Tags 64 MiB
12f465e0b8
Commit Graph

8028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Finn Stutzenstein
52df9dee68
Merge pull request #3822 from FinnStutzenstein/clientCaching 
Singleton DS, inject things into it.
 2018-08-24 10:54:58 +02:00
FinnStutzenstein
95564f9a74 Singleton DS, inject things into it. 2018-08-24 10:47:17 +02:00
Norman Jäckel
36cfb41ff7
Merge pull request #3818 from normanjaeckel/Changelog 
Changed CHANGELOG.
 2018-08-23 21:53:23 +02:00
Norman Jäckel
7c96e2f462 Changed CHANGELOG. 2018-08-23 21:50:46 +02:00
Oskar Hahn
401e7821ae Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-23 21:31:24 +02:00
Norman Jäckel
7dd7bb1b8d
Merge pull request #3807 from ostcar/websocket_protocol 
Add a protocol for websocket
 2018-08-23 21:15:48 +02:00
Norman Jäckel
39e27c740e
Merge pull request #3817 from ostcar/extra_requirements 
Add an easier way to install big_mode
 2018-08-23 21:05:31 +02:00
FinnStutzenstein
22f7d84cae New websocket message format for both clients 2018-08-23 21:02:59 +02:00
Oskar Hahn
fed6d6f435 Add a protocol for websocket 
{'type': STRING, 'content': ANY}
 2018-08-23 21:02:52 +02:00
Oskar Hahn
d21d7dc49e Add an easier way to install big_mode 2018-08-23 20:58:56 +02:00
Oskar Hahn
e8283ac90b
Merge pull request #3805 from ostcar/drop_python3.5 
drop python 3.5
 2018-08-23 17:59:57 +02:00
Oskar Hahn
aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +02:00
Finn Stutzenstein
cbf8a33b8d
Merge pull request #3815 from tsiegleauq/MobileObserveService 
ViewportService and new Prefix
 2018-08-23 17:38:42 +02:00
Emanuel Schütze
96637e18c4
Merge pull request #3804 from normanjaeckel/ChangeCollectStatic 
Fixed collectstattic command so that it does not write into openslide…
 2018-08-23 17:38:26 +02:00
Emanuel Schütze
2a4056816c
Merge pull request #3816 from emanuelschuetze/translations 
Updated German translations.
 2018-08-23 17:30:15 +02:00
Sean Engelhardt
3d54ee9668 Add viewport service, adjust proxy and environment 2018-08-23 17:25:58 +02:00
Emanuel Schütze
7d24066be7 Updated German translations. 2018-08-23 17:20:40 +02:00
Emanuel Schütze
c49eb8bf64
Merge pull request #3808 from FinnStutzenstein/diverses 
Layout changes for motion detail view and PDF
 2018-08-23 16:49:30 +02:00
FinnStutzenstein
cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +02:00
Norman Jäckel
e012589ab0
Merge pull request #3814 from emanuelschuetze/fix3813 
Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
 2018-08-23 15:48:15 +02:00
Emanuel Schütze
8ed043bbe8
Merge pull request #3806 from normanjaeckel/FixAgenda 
Fixed agenda get_restricted_data() if no agenda items exist.
 2018-08-23 15:47:34 +02:00
Norman Jäckel
3578d0e850 Fixed collectstattic command so that it does not write into openslides app dir. 2018-08-23 15:47:19 +02:00
Emanuel Schütze
c852f72c20
Merge pull request #3811 from normanjaeckel/ElectionBar 
Fixed assignment election bar for votes mode. Fixed #3598.
 2018-08-23 15:42:50 +02:00
Emanuel Schütze
0036567f7d Fixed TypeError in Motion and Assignment Slides (Fixed#3813) 
in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces
 2018-08-23 15:39:15 +02:00
Finn Stutzenstein
95c6628732
Merge pull request #3809 from tsiegleauq/MotionStates 
Read the Workflow by state_id in Motion
 2018-08-23 15:11:03 +02:00
Sean Engelhardt
fc7f68f7db Read the motion workflow by state 2018-08-23 15:00:49 +02:00
Finn Stutzenstein
172f1ed890
Merge pull request #3810 from emanuelschuetze/workflow-sorting 
Fix sorting of states in workflow detail view.
 2018-08-23 14:35:04 +02:00
Oskar Hahn
545431e23a
Merge pull request #3799 from ostcar/new_big_mode 
Updates files for big mode
 2018-08-23 11:37:18 +02:00
Norman Jäckel
cbd970ba9d Fixed assignment election bar for votes mode. Fixed #3598. 2018-08-23 11:30:46 +02:00
Norman Jäckel
123b7c702b
Merge pull request #3803 from FinnStutzenstein/voting_decimal_places 
Support for decimal places in motion and assignment polls
 2018-08-23 11:28:26 +02:00
Oskar Hahn
062862683b Updates files for big mode 2018-08-23 11:26:05 +02:00
Emanuel Schütze
2cd8262025 Fix sorting of states in workflow detail view. 2018-08-23 11:12:53 +02:00
Norman Jäckel
dc4fd6a93e Fixed agenda get_restricted_data() if no agenda items exist. 2018-08-23 09:48:47 +02:00
Emanuel Schütze
768c97e89c
Merge pull request #3785 from FinnStutzenstein/no-changeable-first-state 
Do not allow changing a workflow's first state (closes #3778)
 2018-08-23 09:24:29 +02:00
FinnStutzenstein
9c1290ee0b Do not allow changing a workflow's first state (closes #3778) 2018-08-23 09:09:18 +02:00
FinnStutzenstein
9bac396b67 Support for decimal places in motion and assignment polls 2018-08-23 08:53:59 +02:00
Oskar Hahn
d09086f08c
Merge pull request #3798 from ostcar/url-schema 
New url schema
 2018-08-22 22:14:05 +02:00
Oskar Hahn
e5dd857e87 New url schema 2018-08-22 22:05:06 +02:00
Emanuel Schütze
11958c9d1b
Merge pull request #3801 from normanjaeckel/FixAgenda 
Changed default agenda type for new topics.
 2018-08-22 17:47:09 +02:00
Norman Jäckel
27e0564a23 Changed default agenda type for new topics. 2018-08-22 17:27:21 +02:00
Norman Jäckel
48a2a3fe53 Fixed settings creation for windows. 2018-08-22 16:51:46 +02:00
Emanuel Schütze
ad6d05639d
Merge pull request #3800 from tsiegleauq/ms4 
Add create update forms
 2018-08-22 16:28:05 +02:00
Norman Jäckel
83295ebec1
Merge pull request #3797 from normanjaeckel/FixWindows 
Fixed settings creation for windows.
 2018-08-22 16:04:28 +02:00
Sean Engelhardt
70416df50b Add data-send, option to delete motion 2018-08-22 16:03:49 +02:00
Norman Jäckel
07ffb3b6c5 Fixed settings creation for windows. 2018-08-22 12:39:59 +02:00
Sean Engelhardt
de61505b00 Put/Post motions to server 
Temporarily over dataStore, will need own service
 2018-08-22 11:26:53 +02:00
Oskar Hahn
6d1d085e28
Merge pull request #3796 from ostcar/channels2 
Update to  channels 2
 2018-08-22 06:37:29 +02:00
Oskar Hahn
10b3bb6497 Update to channels 2 
* geis does not work with channels2 and never will be (it has to be python now)
* pytest
* rewrote cache system
* use username instead of pk for admin user in tests
 2018-08-22 06:30:11 +02:00
Sean Engelhardt
133ecb4724 add new Motion form 2018-08-21 14:56:26 +02:00
Oskar Hahn
d11d2844b8 Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-20 20:54:54 +02:00