Commit Graph

5000 Commits

Author SHA1 Message Date
Oskar Hahn
37b2996b6c Merge pull request #3358 from ostcar/restricted_user_cache
Add restricted_data_cache
2017-09-06 18:38:14 +02:00
Oskar Hahn
0978cfd5d5 Add restricted_data_cache
This replaces the startup cache
2017-09-06 18:06:57 +02:00
Oskar Hahn
71e154ec6d Merge pull request #3382 from ostcar/remove_dispatch
Rewrite projector_element without dispatch
2017-09-06 18:06:39 +02:00
Oskar Hahn
b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +02:00
Norman Jäckel
c9ad15621c Merge pull request #3383 from FinnStutzenstein/CustomTranslations
Custom Translations
2017-09-05 22:15:21 +02:00
FinnStutzenstein
b35ea2ea5b New layout for agenda list slide, fixing long titles in agenda list view, fixing mediafiles in fullscreen (fixes #3369) 2017-09-05 15:30:59 +02:00
Emanuel Schütze
b416786b40 Merge pull request #3360 from FinnStutzenstein/PinPersonalNote
Pin personal note.
2017-09-05 09:52:31 +02:00
FinnStutzenstein
02428eb8f0 Pin personal note. 2017-09-05 08:24:16 +02:00
FinnStutzenstein
b30919eada Custom Translations 2017-09-05 08:04:02 +02:00
Oskar Hahn
f1d7f85be9 Merge pull request #3380 from ostcar/more_typings
More typings
2017-09-03 19:00:34 +02:00
Oskar Hahn
be94e97889 more typings 2017-09-03 18:34:55 +02:00
Norman Jäckel
438318d3d0 Merge pull request #3386 from emanuelschuetze/fixReasonInlineEditing
Fixed inline editing of motion reason.
2017-09-01 20:41:09 +02:00
Norman Jäckel
fcbe70f742 Merge pull request #3388 from ostcar/fix_3377
Fix PersonalNoteAccessPermissions for anonymous user
2017-09-01 20:33:59 +02:00
FinnStutzenstein
ab1f745be2 Secure Mediafiles and check view permissions 2017-09-01 14:29:46 +02:00
Oskar Hahn
24b07da7b4 Fix PersonalNoteAccessPermissions for anonymous user
fixes: #3377
2017-08-31 22:00:22 +02:00
Emanuel Schütze
f4ac0dd30d Fixed inline editing of motion reason. 2017-08-30 19:23:52 +02:00
Emanuel Schütze
cd637a94c8 Merge pull request #3385 from emanuelschuetze/translations-de
Updated German translations.
2017-08-30 18:04:49 +02:00
Emanuel Schütze
b806e24f87 Updated German translations. 2017-08-30 17:40:26 +02:00
Emanuel Schütze
97a1431c32 Merge pull request #3372 from FinnStutzenstein/Issue3365
Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367)
2017-08-29 11:44:47 +02:00
Emanuel Schütze
0dda74b99b Merge pull request #3375 from emanuelschuetze/ckeditor
Updated to ckeditor 4.7.2
2017-08-29 11:36:58 +02:00
FinnStutzenstein
7d333d4f3b Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367) 2017-08-29 11:36:00 +02:00
Emanuel Schütze
7d6e1f1b97 Merge pull request #3371 from ostcar/new_config
Rewrite config to have id field
2017-08-29 11:31:43 +02:00
Emanuel Schütze
e2e6c8c4b4 Updated to ckeditor 4.7.2 2017-08-29 11:26:18 +02:00
Norman Jäckel
0f322720a4 Merge pull request #3374 from emanuelschuetze/fix-pdf-error-for-reason
Fixed pdf generation error for motion reason.
2017-08-28 21:07:39 +02:00
Norman Jäckel
ffde351718 Merge pull request #3368 from FinnStutzenstein/Issue3364
Different ckeditor toolbar for inline editing
2017-08-28 20:59:44 +02:00
Norman Jäckel
1ca829f902 Merge pull request #3361 from FinnStutzenstein/ReasonInlineEditing
Inline editing for motion reason
2017-08-28 20:53:28 +02:00
Emanuel Schütze
96d3b4178a Fixed pdf generation error for motion reason. 2017-08-24 19:07:01 +02:00
FinnStutzenstein
efbb68cf55 Different ckeditor toolbar for inline editing 2017-08-24 18:49:54 +02:00
Oskar Hahn
87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +02:00
Oskar Hahn
9d1ebac86e Add typing (#3370)
Add typing
2017-08-23 20:51:06 +02:00
FinnStutzenstein
0f6d2d431c Inline editing for motion reason 2017-08-23 09:42:10 +02:00
Norman Jäckel
c4fe50b38d Merge pull request #3362 from FinnStutzenstein/ScrollImprovement
Scroll improvement
2017-08-18 14:30:43 +02:00
Norman Jäckel
effe42464f Merge pull request #3355 from FinnStutzenstein/Issue3169
Mediafile fullscreen (fixes #3169)
2017-08-18 14:26:38 +02:00
Norman Jäckel
acdb66ee36 Merge pull request #3354 from FinnStutzenstein/AssignmentSelectAllFix
Fixing selecting all of assignments
2017-08-18 14:25:09 +02:00
Norman Jäckel
8f9d6fcc07 Merge pull request #3359 from FinnStutzenstein/MediafilesLayout
Fixing layout issues in mediafiles list view
2017-08-18 14:24:38 +02:00
Norman Jäckel
da0a1f76cd Merge pull request #3357 from FinnStutzenstein/ProjectorHeaderFooter
Config for projector header and footer
2017-08-18 14:18:52 +02:00
FinnStutzenstein
94a58afbdf Scroll improvement 2017-08-18 11:55:52 +02:00
FinnStutzenstein
4ec4694f01 Fixing layout issues in mediafiles list view 2017-08-18 08:06:13 +02:00
FinnStutzenstein
07e584ae63 Mediafile fullscreen (fixes #3169) 2017-08-16 14:42:19 +02:00
FinnStutzenstein
c72399ff9b Config for projector header and footer 2017-08-16 14:39:58 +02:00
Emanuel Schütze
14e38861c7 Merge pull request #3342 from FinnStutzenstein/Umlaute
Fixing strange umlauts when copy text from word
2017-08-16 14:11:28 +02:00
FinnStutzenstein
0a1432f047 Fixing strage umlauts when copy text from word 2017-08-16 11:49:31 +02:00
Norman Jäckel
40e3958a7d Merge pull request #3351 from FinnStutzenstein/NoSpecialCommentsInConfig
Exclude special comments in comment field settings; fixing the inline…
2017-08-16 11:45:28 +02:00
Norman Jäckel
76ff708e0e Merge pull request #3348 from FinnStutzenstein/Issue3344
Default sorting for users, mediafiles and assignments (fixes #3344)
2017-08-16 11:44:24 +02:00
Norman Jäckel
0fe7b6bf7d Merge pull request #3337 from FinnStutzenstein/CKEditorImages
Custom CKEditor plugin for browsing mediafiles
2017-08-16 11:41:55 +02:00
FinnStutzenstein
b63262c943 Custom CKEditor plugin for browsing mediafiles 2017-08-16 10:15:34 +02:00
Emanuel Schütze
b01513ac60 Merge pull request #3347 from FinnStutzenstein/Issue3343
Fixing paragraphs in lists when exporting PDF (fixes #3343)
2017-08-16 10:11:39 +02:00
FinnStutzenstein
c36b756f25 Fixing paragraphs in lists when exporting PDF (fixes #3343) 2017-08-16 09:52:30 +02:00
FinnStutzenstein
1fb9b07c6b Fixing selecting all of assignments 2017-08-16 09:49:07 +02:00
FinnStutzenstein
a365127a1c default sorting for users, mediafiles and assignments (fixes #3344) 2017-08-16 09:13:33 +02:00