ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,372 Commits 6 Branches 42 Tags 64 MiB
1230f4a29a
Commit Graph

4372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
f10a3ffcb3 Merge pull request #2913 from emanuelschuetze/translations 
Updated translations (CS, ES, PT, FR).
 2017-01-26 21:42:57 +01:00
Emanuel Schütze
8234340a0c Merge pull request #2909 from ostcar/rework_auth 
Created a function to convert anything possible to a user-collection-element or None
 2017-01-26 21:42:40 +01:00
Emanuel Schütze
b3800ad873 Updated translations (CS, ES, PT, FR). 2017-01-26 21:37:29 +01:00
Norman Jäckel
ad937aecb3 Typos and small changes. 2017-01-26 21:35:26 +01:00
Emanuel Schütze
c36835a40e Merge pull request #2910 from emanuelschuetze/redis-prefix 
Use custom redis prefix for asgi and cache entries.
 2017-01-26 21:24:05 +01:00
Emanuel Schütze
1d55e2b92b Merge pull request #2912 from normanjaeckel/SetIdentifierFix 
Fixed bug in motion set_identifier method. Fixed #2911.
 2017-01-26 21:23:32 +01:00
Oskar Hahn
5dcfc69ff8 Update settings.py.tpl 
Also the last line of a dict should end with a ',' or with the closing }
 2017-01-26 21:17:36 +01:00
Emanuel Schütze
98e6f703e1 Use custom redis prefix for asgi and cache entries. 
Note: These prefix have to be unique for each OpenSlides instance!
 2017-01-26 21:17:32 +01:00
Norman Jäckel
2872cd437c Fixed bug in motion set_identifier method. Fixed #2911. 2017-01-26 21:03:10 +01:00
Oskar Hahn
2daafa8db9 Created a function to convert anything possible to a user-collectoin-element or None 
Changed user.has_perm(...) to has_perm(user, ...) at any place.

Removed old code
 2017-01-26 18:57:10 +01:00
Emanuel Schütze
8897e22df0 Merge pull request #2907 from emanuelschuetze/pagination 
Used better pagination for agenda, motions and users.
 2017-01-25 21:23:45 +01:00
Emanuel Schütze
32ccddfa71 Merge pull request #2902 from FinnStutzenstein/ClientPermissions 
Watch perms in client (closes #1855)
 2017-01-25 21:21:27 +01:00
FinnStutzenstein
35903cbe97 Watch perms in client (closes #1855) 2017-01-25 20:19:25 +01:00
Emanuel Schütze
df3e691734 Used better pagination for agenda, motions and users. 
to increase the browser performance while switching between apps.
 2017-01-25 19:51:51 +01:00
Norman Jäckel
df60700612 Merge pull request #2882 from normanjaeckel/ChannelSendWait 
Let channels' send method wait and retry if channel layer is full.
 2017-01-25 16:40:43 +01:00
Norman Jäckel
70f5a95be1 Merge pull request #2906 from emanuelschuetze/fixMotionImport 
Added trim function for get_full_name/get_short_name.
 2017-01-25 15:12:11 +01:00
Emanuel Schütze
0d30c72270 Added trim function for get_full_name/get_short_name. 
Required by submitter comparison for motion import.
 2017-01-25 14:38:51 +01:00
Norman Jäckel
e0d5f6d92f Merge pull request #2881 from ostcar/has_perm_with_id 
Changed the function has_perm to support an user id or None as the fi…
 2017-01-24 22:17:12 +01:00
Norman Jäckel
4e47fa7634 Merge pull request #2905 from FinnStutzenstein/ResolveFix 
Fixing missing ballot resolver
 2017-01-24 16:00:11 +01:00
Oskar Hahn
44474049c3 Added docstrings 2017-01-24 15:16:29 +01:00
Oskar Hahn
fccde8de11 Changed the function has_perm to support an user id or None as the first argument. 
Also fixt the case, where an anonymous user connects to the websocket connection.

Also added a function anonymous_is_enabled() to see, if the anyonmous user is enabled.

Added pip freeze to travis to see installed versions.
 2017-01-24 15:16:29 +01:00
FinnStutzenstein
40c2cdbe50 Fixing missing ballot resolver 2017-01-24 12:40:44 +01:00
Norman Jäckel
fb047fc5b9 Merge pull request #2899 from FinnStutzenstein/IssueCsvIE 
Csv export for IE (closes #2898)
 2017-01-23 16:59:07 +01:00
FinnStutzenstein
9247009f1c Csv export for IE (closes #2898) 2017-01-23 16:24:25 +01:00
Emanuel Schütze
29907c83b7 Merge pull request #2886 from FinnStutzenstein/Resolver 
Removing unnecessary resolvers (closes #2869)
 2017-01-20 12:00:39 +01:00
FinnStutzenstein
2b8a1168e0 Removing unnecessary resolvers (closes #2869, closes #2892) 2017-01-20 11:52:27 +01:00
Norman Jäckel
a724898ba3 Merge pull request #2875 from matakuka/removespeakers 
delete list of speaker error messages (closes #2237)
 2017-01-19 13:22:28 +01:00
Emanuel Schütze
776c7b55fe Merge pull request #2893 from emanuelschuetze/translations201701 
Translation update
 2017-01-19 10:51:55 +01:00
Emanuel Schütze
8daaebbcd0 Updated translation resource and German translation file. 2017-01-19 10:43:04 +01:00
Emanuel Schütze
b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
Emanuel Schütze
52602d8330 Merge pull request #2884 from FinnStutzenstein/MotionProject 
Reorder projection of motions (fixes #2883)
 2017-01-18 19:07:01 +01:00
Emanuel Schütze
601edfcce7 Merge pull request #2890 from normanjaeckel/CollectStatic 
Fixed error when running manage.py collectstatic. Fixed #2861.
 2017-01-18 19:01:07 +01:00
Norman Jäckel
f271d8bb47 Fixed error when running manage.py collectstatic. Fixed #2861. 2017-01-18 15:33:45 +01:00
Maximilian Krambach
929a7e5e89 delete list of speaker error messages (closes #2237) 2017-01-16 18:37:59 +01:00
Norman Jäckel
3b58c76287 Merge pull request #2874 from FinnStutzenstein/StateBuild 
StartUp improvements
 2017-01-16 15:29:44 +01:00
FinnStutzenstein
2ac7df2ee6 Reorder projection of motions (fixes #2883) 2017-01-16 15:15:29 +01:00
FinnStutzenstein
bd0073d2f7 StartUp improvements 2017-01-16 14:32:10 +01:00
Norman Jäckel
bb8748a506 Let channels' send method wait and retry if channel layer is full. Fixed #2353. 2017-01-15 22:01:09 +01:00
Emanuel Schütze
e9e0280a13 Merge pull request #2878 from FinnStutzenstein/MotionProjectFix 
Hotfix for motion projection
 2017-01-15 13:42:06 +01:00
Norman Jäckel
0546639934 Merge pull request #2866 from FinnStutzenstein/Issue2843 
smoothly scroll projector
 2017-01-15 13:34:51 +01:00
Norman Jäckel
26a4f7ad0c Merge pull request #2880 from emanuelschuetze/issue2787 
Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787)
 2017-01-15 13:34:10 +01:00
Emanuel Schütze
4a7ffe9da9 Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787) 2017-01-15 13:04:31 +01:00
Emanuel Schütze
befff17969 Merge pull request #2873 from normanjaeckel/MotionCommentProtection 
Fixed bug in relation for motion comment. Fixed #2568.
 2017-01-15 12:27:17 +01:00
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