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

5229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
1672c2de66 Merge pull request #2872 from normanjaeckel/AgendaComment 
Fixed security issue #2850: Comments were shown for unprivileged users.
 2017-01-15 12:23:22 +01:00
Norman Jäckel
9250055e35 Merge pull request #2876 from emanuelschuetze/issue2763 
Adapted motion DOCX template.
 2017-01-15 12:21:27 +01:00
Norman Jäckel
0461238831 Merge pull request #2879 from emanuelschuetze/projector-url 
Use always '/' at the end of projector url.
 2017-01-15 12:20:55 +01:00
Emanuel Schütze
0eb4f67a48 Use always '/' at the end of projector url. 
e.g. '/projector/1/' or '/real-projetor/1/'
 2017-01-15 12:13:46 +01:00
FinnStutzenstein
b419818b20 Hotfix for motion projection 2017-01-15 12:04:16 +01:00
Emanuel Schütze
986e8cc4f6 Adapted motion DOCX template (Fixed #2763). 2017-01-15 10:59:09 +01:00
FinnStutzenstein
a3b7b92239 smoothly scroll projector 2017-01-15 10:56:26 +01:00
Norman Jäckel
c6b1df9e24 Fixed security issue #2850: Comments were shown for unprivileged users. 2017-01-15 10:26:37 +01:00
Norman Jäckel
f086d055b6 Fixed bug in relation for motion comment. Fixed #2568. 2017-01-15 10:20:45 +01:00
Emanuel Schütze
2a42368157 Merge pull request #2870 from normanjaeckel/GulpFix 
Fixed gulp.
 2017-01-15 09:36:06 +01:00
Norman Jäckel
7ec128a0ec Fixed gulp. 2017-01-15 00:39:07 +01:00
Emanuel Schütze
624fcc663b Merge pull request #2863 from FinnStutzenstein/StartUp 
Start up
 2017-01-14 21:46:16 +01:00
FinnStutzenstein
a6d1eeb9c3 Worked on startup process. 
- fix group view on reload
 2017-01-14 21:23:05 +01:00
Norman Jäckel
481a36501f Refactored WhoAmI view and startup process. 2017-01-14 21:22:40 +01:00
Norman Jäckel
8bb0918372 Merge pull request #2825 from FinnStutzenstein/CsvImports 
New csv import for users and topics
 2017-01-14 20:52:09 +01:00
Oskar Hahn
ebf686ef34 Send all data to the client at startup 2017-01-14 20:42:38 +01:00
FinnStutzenstein
397d659f0b New csv import for users and topics 2017-01-14 18:29:05 +01:00
Norman Jäckel
1bc35faa55 Merge pull request #2867 from boehlke/dockerfile_change 
Updated production deployment dependencies
 2017-01-14 18:15:21 +01:00
André Böhlke
57a3f9b786 Updated production deployment dependencies 2017-01-14 18:11:19 +01:00
Norman Jäckel
4b03a7ad5b Merge pull request #2831 from normanjaeckel/UserLoginTimestamp 
Skipped autoupdate for user during login. See #2804.
 2017-01-14 17:48:32 +01:00
Norman Jäckel
acab868c79 Quickfix for #2865. The problem is not completely solved. 2017-01-14 17:15:30 +01:00
Norman Jäckel
aefd5073a7 Skipped autoupdate for user during login. See #2804. 2017-01-14 16:45:14 +01:00
Norman Jäckel
560b820b57 Merge pull request #2855 from emanuelschuetze/issue2623 
Validates open posts field of assignment form (Fixes #2623)
 2017-01-14 16:16:35 +01:00
Emanuel Schütze
4faf580239 Validates open posts field of assignment form (Fixes #2623) 2017-01-14 15:30:02 +01:00
Norman Jäckel
286119108c Merge pull request #2860 from FinnStutzenstein/Issue2852 
adding permission checks
 2017-01-14 15:12:19 +01:00
Norman Jäckel
3600dd58f0 Merge pull request #2858 from emanuelschuetze/issue2142 
Assignment list: Used number of candidates, removed number of needed …
 2017-01-14 15:11:21 +01:00
Norman Jäckel
a8fd42f26b Merge pull request #2857 from emanuelschuetze/issue2828 
Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828).
 2017-01-14 15:10:50 +01:00
Emanuel Schütze
527f949968 Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142) 2017-01-14 12:55:51 +01:00
Emanuel Schütze
d76162e3b0 Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828). 2017-01-14 12:46:23 +01:00
FinnStutzenstein
794db79511 adding permission checks 2017-01-14 12:13:38 +01:00
Emanuel Schütze
458a7cf7c4 Merge pull request #2846 from normanjaeckel/MotionBlockSecu 
Fixed motion create view. Fixed #2506.
 2017-01-14 12:10:51 +01:00
Emanuel Schütze
8c4b38f018 Merge pull request #2847 from FinnStutzenstein/Issue2844 
Group order and hide internal items filter
 2017-01-14 11:39:51 +01:00
Emanuel Schütze
8c9bde27fb Merge pull request #2853 from normanjaeckel/ManagePy 
Added error message for unknown args. Fixed #2200.
 2017-01-14 11:39:17 +01:00
Norman Jäckel
a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
FinnStutzenstein
f092d6670d Group order, hide internal items filter, hide comment in agenda list view 2017-01-14 10:51:07 +01:00
Norman Jäckel
aa47ecbf8a Added error message for unknown args. Fixed #2200. 2017-01-14 10:48:41 +01:00
Emanuel Schütze
99a771ac6c Merge pull request #2845 from FinnStutzenstein/Issue2833 
Fixing user list view with restricted permissions (closes #2833)
 2017-01-14 10:47:12 +01:00
Norman Jäckel
663feff806 Merge pull request #2848 from emanuelschuetze/issue2421 
Added text to empty assignment poll result slide (Fixed #2421)
 2017-01-14 10:41:24 +01:00
Emanuel Schütze
35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838 
Fixing #2838
 2017-01-14 10:40:57 +01:00
Emanuel Schütze
113aac59b3 Added text to empty assignment poll result slide (Fixed #2421) 2017-01-14 10:21:19 +01:00
FinnStutzenstein
76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
FinnStutzenstein
c0f092d811 Fixing user list view with restricted permissions (closes #2833) 2017-01-14 09:57:45 +01:00
Norman Jäckel
d22dff2743 Merge pull request #2841 from flanagan/remove-summary 
Removed recommendation motion summary on slide.
 2017-01-13 21:32:50 +01:00
Norman Jäckel
6d82208fb0 Merge pull request #2840 from ostcar/fix_channels 
Fix channels
 2017-01-13 21:31:58 +01:00
Meinert Leinigen
d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +01:00
Oskar Hahn
1dc671430a Fix channels 2017-01-13 20:53:06 +01:00
Norman Jäckel
717d346321 Merge pull request #2794 from ostcar/group_cache 
Group cache
 2017-01-13 13:58:40 +01:00
Oskar Hahn
728576d514 Performance improvements 
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
 2017-01-13 13:37:18 +01:00
Norman Jäckel
299811b4a5 Merge pull request #2834 from emanuelschuetze/channels 
Upgrade to channels 1.x (Fixes #2829).
 2017-01-13 12:18:44 +01:00
Emanuel Schütze
aca97da9c6 Merge pull request #2837 from emanuelschuetze/dockerfile 
Use gulp production mode in docker images.
 2017-01-12 15:56:27 +01:00