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
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
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
