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

7195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Saalfeld
f8d29d083a
Travis linting and some minor changes 
* properly ignore multiple virtual environments and vscode folders

* use scss instead of css in app.component

* remove yarn from client

* remove deprication error

* auditing packages

* updating travis to work with the new client
 2018-08-28 10:35:22 +02:00
Finn Stutzenstein
3fced15d7f
Merge pull request #3831 from FinnStutzenstein/clientCaching 
Caching, preparations for the chage id
 2018-08-27 12:41:56 +02:00
FinnStutzenstein
4d6f703e32 Caching, preparations for the chage id 2018-08-27 12:36:33 +02:00
Emanuel Schütze
1dd1a4bac8
Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda 
Hide Sort button in agenda (closes #3812)
 2018-08-27 12:14:26 +02:00
FinnStutzenstein
d1b52a9302 Hide Sort button in agenda (closes #3812) 2018-08-27 11:24:52 +02:00
Emanuel Schütze
b3e86c0507
Merge pull request #3830 from emanuelschuetze/categoryListView 
Added motion category list view.
 2018-08-27 10:09:52 +02:00
Emanuel Schütze
ba496d54b4 Added motion category list view. 2018-08-27 09:10:57 +02:00
Oskar Hahn
2ae42caceb Faster then fastes big_mode (with tests) 2018-08-25 17:11:29 +02:00
Emanuel Schütze
bec7224c9b
Merge pull request #3827 from emanuelschuetze/motion-pdf-default 
Change default for motion export dialog.
 2018-08-24 16:23:22 +02:00
Emanuel Schütze
702bc67334 Change default for motion export dialog. 2018-08-24 16:14:01 +02:00
Emanuel Schütze
053b284691
Merge pull request #3826 from emanuelschuetze/motionPDF 
Enable/disable category in motion PDF.
 2018-08-24 14:52:17 +02:00
Emanuel Schütze
56706e6cef
Merge pull request #3824 from tsiegleauq/work-on-motion-copy 
Work on local motion copy
 2018-08-24 14:05:31 +02:00
Emanuel Schütze
6c2fbf7389 Enable/disable category in motion PDF. 2018-08-24 14:00:53 +02:00
Oskar Hahn
a67e0943fb
Merge pull request #3825 from ostcar/OpenSlides-3 
fix new super fast big mode (even faster)
 2018-08-24 13:07:41 +02:00
Oskar Hahn
2613c7fe05 fix new super fast big mode (even faster) 2018-08-24 12:36:21 +02:00
Sean Engelhardt
5fc85f2621 Work on local motion copy 2018-08-24 12:29:07 +02:00
Oskar Hahn
dc7ca5e2c4 fix empty values in rest 2018-08-24 12:14:02 +02:00
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