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

6080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean
f7bc087c32
Merge pull request #4126 from MaximilianKrambach/follow_motionblock 
simplify followRecommendation for motionBlock
 2019-01-18 20:39:42 +01:00
Sean
5a74c7d662
Merge pull request #4121 from MaximilianKrambach/speechcount 
warn/show speaker-call amount
 2019-01-18 20:31:14 +01:00
Sean Engelhardt
9b61603dae Add motion to pdf converter 
Adds the converstion from motion to PDF.
Uses pdfmake as the old openslides does
 2019-01-18 20:25:06 +01:00
Norman Jäckel
168561bc55 Added gender field for users. 2019-01-18 19:47:00 +01:00
Maximilian Krambach
758abde410 simplify followRecommendation for motionBlock 2019-01-18 19:17:48 +01:00
Finn Stutzenstein
8bd24d690d
Merge pull request #4118 from FinnStutzenstein/notify 
Make OS3 notify ready
 2019-01-18 17:55:24 +01:00
Oskar Hahn
d5b09b4513
Merge pull request #4106 from ostcar/python-3.6-f-strings 
use f-string syntax for strings
 2019-01-18 17:47:12 +01:00
FinnStutzenstein
728f3f84c4 Some teamwork improvements 2019-01-18 17:44:26 +01:00
Oskar Hahn
b329115007 use f-string syntax for strings 2019-01-18 17:37:36 +01:00
Maximilian Krambach
3b5876009c warn/show speaker-call amount 2019-01-18 17:19:56 +01:00
FinnStutzenstein
47a09e4bce Make OS3 notify ready 2019-01-18 17:03:09 +01:00
Oskar Hahn
9563858c7a
Merge pull request #4119 from ostcar/projector_config_in_websocket 
Add the projector config into the data send via websocket
 2019-01-18 16:25:43 +01:00
Oskar Hahn
5127d659db Add the projector config into the data send via websocket 2019-01-18 15:38:20 +01:00
Sean
eec3fba34a
Merge pull request #4114 from MaximilianKrambach/csvimport/all 
csv-import for user and agenda(topics)
 2019-01-18 14:20:39 +01:00
Maximilian Krambach
c52fdaae6c csv-import for user and agenda(topics) 2019-01-18 13:15:54 +01:00
Sean
c3ed0d0dad
Merge pull request #4112 from MaximilianKrambach/sortSearchFixes 
sortSearch improvements (fixes #4098)
 2019-01-18 13:05:47 +01:00
Maximilian Krambach
82a1ad8709 sortSearch improvements (#4098) 
- "no workflows set" removed
-  motion block filter hides if there is no motion block
- inserted the group filter
- fixed display of agenda filter menu
- show plural if multiple filters are selected, show filtered amount
- recommendation, done/not done status filter
- active filter count and clearing option
- number of current items to the left
 2019-01-18 12:51:04 +01:00
Emanuel Schütze
57202e74ca
Merge pull request #4117 from CatoTH/Issue4108-Unknown-ChangeRecoMode 
Move lnMode/crMode/lineLength into components, Bugfix for lineLength …
 2019-01-17 18:04:38 +01:00
Tobias Hößl
1966a4b4f8
Move lnMode/crMode/lineLength into components, Bugfix for lineLength - fixes #4108 2019-01-17 17:50:10 +01:00
Sean
566bb93ba5
Merge pull request #4115 from emanuelschuetze/pwa 
Use OpenSlides as Progressive Web App (PWA).
 2019-01-17 16:20:37 +01:00
Emanuel Schütze
f83f3fed46 Use OpenSlides as Progressive Web App (PWA). 2019-01-17 15:58:05 +01:00
Sean
19a3fcebf3
Merge pull request #4088 from MaximilianKrambach/motionpoll 
motion polls
 2019-01-17 15:40:34 +01:00
Maximilian Krambach
d5101714d1 motion polls 2019-01-17 14:03:34 +01:00
Sean
85a2597b27
Merge pull request #4110 from jsaalfeld/logo_component 
adding and implementing logo component
 2019-01-16 16:08:15 +01:00
Jochen Saalfeld
f8cfb418f6
adding and implementing logo component 2019-01-16 15:54:34 +01:00
Sean
460b3dcac9
Merge pull request #4113 from jsaalfeld/fix_travis_headless_browser 
Fix Headless Browser Start with Travis
 2019-01-15 13:31:10 +01:00
Jochen Saalfeld
1091ac4e76
Fix Headless Browser Start with Travis 
Even though the documentation of travis still states, that xvfb can be
initialized via init.d, it seems that all images are updated to use
systemd, therefore it was switched to the travis service syntax.
 2019-01-15 13:09:35 +01:00
Norman Jäckel
ce64ff7ac8
Merge pull request #4107 from ostcar/development_tools 
Undo #4086 after pytest is fixed and released
 2019-01-14 21:28:27 +01:00
Jochen Saalfeld
4c02661649
Merge pull request #4102 from MaximilianKrambach/npmfix 
fix vulnerable npm dependency angular-devkit
 2019-01-14 10:00:59 +01:00
Oskar Hahn
6c312cb6a4 Undo #4086 after pytest is fixed and released 2019-01-12 23:28:44 +01:00
Oskar Hahn
5ff16d6c5f
Merge pull request #4081 from ostcar/new_projector 
New projector
 2019-01-12 23:23:06 +01:00
Oskar Hahn
a0f554674b New projector system. Add first slides 2019-01-12 21:21:43 +01:00
Emanuel Schütze
73e1853758
Merge pull request #4094 from emanuelschuetze/ui 
UI improvements
 2019-01-11 17:00:48 +01:00
Emanuel Schütze
1ff84c1ae1 UI improvements 2019-01-11 16:51:43 +01:00
Emanuel Schütze
e69cf2f0f7
Merge pull request #4101 from FinnStutzenstein/prettifier_doku 
added missing documentation about prettifier
 2019-01-11 16:06:01 +01:00
Emanuel Schütze
e8a4480014
Merge pull request #4099 from FinnStutzenstein/motion-title-fix 
fixed motion title in agenda
 2019-01-11 16:02:10 +01:00
Sean
7226d04106
Merge pull request #4076 from MaximilianKrambach/csvimport/motions 
motion csv import
 2019-01-11 15:42:54 +01:00
Maximilian Krambach
5d989a8847 fix vulnerable npm dependency angular-devkit 2019-01-11 11:20:50 +01:00
Maximilian Krambach
060d8c8324 motion csv import 2019-01-11 10:47:20 +01:00
FinnStutzenstein
5196780b3a added missing documentation about prettifier 2019-01-11 10:43:20 +01:00
Finn Stutzenstein
c76e7165af
Merge pull request #4096 from MaximilianKrambach/httpError 
fix login not responding to errors
 2019-01-10 15:07:13 +01:00
Maximilian Krambach
e0e88ce891 fix login not responding to errors 2019-01-10 14:04:10 +01:00
Jochen Saalfeld
2f7336b257
Merge pull request #4067 from FinnStutzenstein/prettify 
Using prettify instead of pretty-quick-wrapper
 2019-01-10 13:12:02 +01:00
FinnStutzenstein
1c895fbea8 run prettifier 2019-01-10 12:54:48 +01:00
FinnStutzenstein
6e87a4bd80 Use prettier 2019-01-10 12:54:22 +01:00
FinnStutzenstein
ebe068155a fixed motion title in agenda 2019-01-10 12:50:12 +01:00
Finn Stutzenstein
b01b20f4b4
Merge pull request #4097 from jsaalfeld/fix_pypi_module_error 
fixing Module not found error
 2019-01-10 12:39:56 +01:00
Jochen Saalfeld
c9df66ffb9
fixing Module not found error 
should fix #4069
 2019-01-10 12:30:13 +01:00
Finn Stutzenstein
44846da4cd
Merge pull request #4095 from jsaalfeld/fix_trailing_slash 
fixing the wsgi server by removing trailing slashes on static files
 2019-01-10 11:46:20 +01:00
Jochen Saalfeld
73a3001a35
fixing the wsgi server by removing trailing slashes on static files 
fixes #4091
 2019-01-09 21:31:48 +01:00