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

3734 Commits

Author SHA1 Message Date
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
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
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
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
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
FinnStutzenstein
a12440ed2c Exclude special comments in comment field settings; fixing the inline editiing 2017-08-16 09:09:22 +02:00
Emanuel Schütze
f0d840148e Merge pull request #3330 from FinnStutzenstein/PluginDev 
Improvements for plugin integration
 2017-08-14 15:06:14 +02:00
Emanuel Schütze
81f841d5e5 Merge pull request #3310 from emanuelschuetze/new-logo 
Added new logo placeholder for web interface header logo.
 2017-08-14 14:50:07 +02:00
FinnStutzenstein
08c9dda1de Improvements for plugin integration 2017-08-14 14:48:31 +02:00
Emanuel Schütze
32c36996b0 Merge pull request #3345 from FinnStutzenstein/testData 
some changes in the example data plugin
 2017-08-14 10:52:45 +02:00
Emanuel Schütze
298d41def7 Merge pull request #3346 from FinnStutzenstein/Issue3232 
removing obsolete merge-before
 2017-08-14 10:00:57 +02:00
FinnStutzenstein
727d1341e8 some changes in the example data plugin 2017-08-14 09:56:48 +02:00
FinnStutzenstein
52e2d2ca83 removing obsolete merge-before (fixes #3232) 2017-08-14 09:51:20 +02:00
Norman Jäckel
e2a32e403d Merge pull request #3349 from FinnStutzenstein/ColorInPdf 
Fixing wrong styles in PDF
 2017-08-12 13:48:08 +02:00
Norman Jäckel
305356f75f Unproject elements when they are deleted. Fixed #3292. 2017-08-12 13:27:23 +02:00
Emanuel Schütze
2c43bfee47 Rework on ballot paper layout for using logos. 2017-08-11 12:50:49 +02:00
FinnStutzenstein
bf56067d17 poll and ballot paper logos 2017-08-11 12:48:48 +02:00
Emanuel Schütze
3e1c1abe14 Added new logo placeholder for web interface header logo. 2017-08-11 12:48:48 +02:00
FinnStutzenstein
5d902d809f Fixing wrong stlyes in PDF 2017-08-11 10:34:03 +02:00
Tobias Hößl
54e067d9d9 Allow OL[start] - fixes #3339 
Style
 2017-08-02 21:27:12 +02:00
Norman Jäckel
2aeaf251a2 Merge pull request #3335 from emanuelschuetze/config-order 
Reorder weight fields of core configs.
 2017-07-28 14:53:53 +02:00
Emanuel Schütze
5ee0219702 Reorder weight fields of core configs. 2017-07-28 14:31:59 +02:00
Emanuel Schütze
96be75fc0d Motion formatting and sort fixes 
- Adapt font size of outside linenumbers in motion pdf, depending on
  selected standard font size.
- Enlarge width of first column in of meta table of motion pdf.
- Fixed order issue in motion list: Sort always by identifier (also
  after selecting a custom sort parameter).
 2017-07-28 14:26:28 +02:00
Emanuel Schütze
c5c15d26b5 Merge pull request #3333 from emanuelschuetze/translations 
Updated German translations.
 2017-07-27 15:24:16 +02:00
Emanuel Schütze
6b291726a4 Updated German translations. 2017-07-27 15:17:40 +02:00
Emanuel Schütze
2dc7db2b8c Merge pull request #3288 from CatoTH/Issue3269-Issue3232-Split-Elements2 
Issue3269 issue3232 split elements2
 2017-07-27 15:12:44 +02:00
Emanuel Schütze
3c9a67d084 Merge pull request #3332 from emanuelschuetze/fontsize 
Added config option for standard font size in PDF.
 2017-07-27 15:04:01 +02:00
Tobias Hößl
7b62c60350 Marks split list items with CSS-classes and hides the bullet points - fixes #3269 2017-07-27 14:42:51 +02:00
Emanuel Schütze
d57d3efcf4 Added config option for standard font size in PDF. 2017-07-27 14:36:49 +02:00
Emanuel Schütze
3c747c01e2 Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export 
Hide special comments in export
 2017-07-27 14:36:04 +02:00
FinnStutzenstein
2e2d28288a Hide special comments in export 2017-07-27 12:44:13 +02:00
FinnStutzenstein
c65976715e configvalue for sequential number 2017-07-27 11:15:12 +02:00
FinnStutzenstein
1f59336e3e Configvalue for pagenumber alignment in PDF 2017-07-27 10:55:40 +02:00
Emanuel Schütze
41ab706939 Merge pull request #3323 from FinnStutzenstein/hide-error-on-load 
Delay the projector not loaded error.
 2017-07-27 10:51:18 +02:00
Norman Jäckel
f806dc4017 Merge pull request #3329 from FinnStutzenstein/category-sort-in-export 
Add the option to sort the categories different in the motion export
 2017-07-27 10:41:02 +02:00
FinnStutzenstein
8560509ace Delay the projector not loaded error. 2017-07-27 10:06:11 +02:00
FinnStutzenstein
a32b046fa5 Add the option to sort categories different in motion export. 2017-07-27 09:50:03 +02:00
FinnStutzenstein
6c5cc799ca Fixing mediafiles list view for medifiles without a type 2017-07-26 15:46:14 +02:00
Emanuel Schütze
5644e99b43 Merge pull request #3319 from FinnStutzenstein/docx-text-missing 
fixing docx parser missing text
 2017-07-26 15:03:27 +02:00
Emanuel Schütze
a44b84e836 Merge pull request #3318 from normanjaeckel/CategorySortError 
Fixed error on category numbering. Fixed #3315.
 2017-07-26 14:41:27 +02:00
FinnStutzenstein
9c0a10df63 fixing wrong entered comments 2017-07-20 14:43:58 +02:00
FinnStutzenstein
615327f64d fixing docx parser missing text 2017-07-19 13:08:31 +02:00
Norman Jäckel
41a70f40df Fixed error on category numbering. Fixed #3315. 2017-07-05 22:13:54 +02:00
Norman Jäckel
77a321894b Merge pull request #3306 from FinnStutzenstein/Issue2862 
Remove OPTION request to query permissions (fixes #2862)
 2017-07-05 21:26:08 +02:00
Emanuel Schütze
3006cb388f Merge pull request #3304 from CatoTH/Issue3298-PreventCollidingChangeRecommendations 
Prevent colliding change recommendations - fixes #3298
 2017-06-29 18:18:36 +02:00
Tobias Hößl
65d5bbccd6 Prevent colliding change recommendations - fixes #3298 2017-06-29 18:03:58 +02:00
FinnStutzenstein
90af3e6d1d remove OPTION request to query permissions (fixes #2862) 2017-06-29 13:25:52 +02:00
FinnStutzenstein
37eec7d99b Minor Bugfixes (fixes #3312, fixes #3313) 2017-06-29 08:59:41 +02:00
Emanuel Schütze
574d815397 Merge pull request #3311 from FinnStutzenstein/projector-size 
Projectorsize selection with slider
 2017-06-28 12:43:42 +02:00
FinnStutzenstein
2d35b9e371 Projectorsize selection with slider 2017-06-28 09:23:40 +02:00
Emanuel Schütze
b1d98ca33a Merge pull request #3308 from FinnStutzenstein/agenda-project 
call the own project method from a content object of an agenda item
 2017-06-27 12:53:02 +02:00
Norman Jäckel
029366de5f Merge pull request #3301 from FinnStutzenstein/related-projected 
Highlight objects in list view, if related objects are projected
 2017-06-21 22:56:15 +02:00
Norman Jäckel
e72af0101c Merge pull request #3309 from FinnStutzenstein/Issue3307 
fix not supported 'startsWith' function in IE11 (fixes #3307)
 2017-06-21 21:45:15 +02:00
FinnStutzenstein
f42b6f0d37 fix not supported 'startsWith' function in IE11 (fixes #3307) 2017-06-21 15:28:43 +02:00
FinnStutzenstein
ef60f5ea44 call the own project method from a content object of an agenda item 2017-06-21 15:09:38 +02:00
FinnStutzenstein
0a1ea46b8d fix projector reconnecting if websocket is closed 2017-06-21 13:18:06 +02:00
FinnStutzenstein
2536b35c0e Highlight objects in list view, if related objects are projected 2017-06-21 07:52:10 +02:00
Emanuel Schütze
573fc4da57 Merge pull request #3267 from normanjaeckel/NewPersonalNote 
Rework on personal notes.
 2017-06-16 12:38:40 +02:00
Emanuel Schütze
45a2e3bbc4 Updated js pot file and German translations. 2017-06-16 12:24:11 +02:00
Emanuel Schütze
bef986630e Merge pull request #3297 from FinnStutzenstein/Issue3295 
improved reconnect handling if the server was flushed (fixed #3295)
 2017-06-16 07:56:30 +02:00
FinnStutzenstein
4387a56fb1 Improved reconnect handling if the server was flushed (fixed #3295). 
just ping with whoami request
 2017-06-16 07:47:17 +02:00
FinnStutzenstein
2e898275cb Some small changes and bugfixes 2017-06-15 14:25:55 +02:00
Norman Jäckel
eaebeb8f06 Fixed get_projector_data impementation. Closed #3282. 2017-06-13 22:21:56 +02:00
FinnStutzenstein
c80b0abc82 Personal note: client rework 2017-06-13 20:58:17 +02:00
Norman Jäckel
91d365e386 Rework on personal notes. Fixed #3262. 2017-06-13 20:58:17 +02:00
Norman Jäckel
7947f2ed34 Merge pull request #3293 from ostcar/no_anonymous_no_cry 
Block anonymous from websocket, if they are deactivated
 2017-06-13 11:34:02 +02:00
Norman Jäckel
260cd5cd16 Merge pull request #3290 from FinnStutzenstein/Issue1533-neu 
Massimport for users
 2017-06-12 22:07:32 +02:00
Norman Jäckel
d1c86e8b0d Merge pull request #3291 from FinnStutzenstein/userImportFix 
Fix import on not full populated csv files
 2017-06-12 22:04:56 +02:00
Oskar Hahn
8920ffac66 Block anonymous from websocket, if they are deactivated 2017-06-10 09:25:27 +02:00
FinnStutzenstein
8cb6342e73 Fix import on not full populated csv files 2017-06-09 14:57:06 +02:00
FinnStutzenstein
433cdc42fa Massimport for users 2017-06-08 14:40:29 +02:00
Emanuel Schütze
fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda 
Fixes autoupdate bug for a user without user.can_see_name permission …
 2017-06-07 21:00:12 +02:00
Norman Jäckel
ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
Emanuel Schütze
5a945c3a71 Merge pull request #3287 from CatoTH/diff-bugfix 
Fix a bug where a single moved word was not highlighted in the diff
 2017-06-07 20:15:48 +02:00
FinnStutzenstein
9448beb903 Fixes some PDF issues 2017-06-07 07:55:49 +02:00
Tobias Hößl
029ca0b8e3 Fix a bug where a single moved word was not highlighted in the diff 2017-06-06 19:28:52 +02:00
Emanuel Schütze
074559ba23 Merge pull request #3279 from FinnStutzenstein/Issue3273 
Fixing linenumbers on page break (fixes #3273)
 2017-06-01 15:31:36 +02:00
Emanuel Schütze
53d50242b6 Merge pull request #3274 from FinnStutzenstein/Issue3259 
Do not reload all projector elements on every autoupdate (fixes #3259).
 2017-06-01 15:24:02 +02:00
FinnStutzenstein
a83cd5b947 Fixing linenumbers on page break (fixes #3273) 2017-06-01 15:22:52 +02:00
FinnStutzenstein
678a56db08 Do not reload all projector elements on every autoupdate (fixes #3259). 2017-06-01 15:01:24 +02:00
Emanuel Schütze
2994f7713b Hotfix for issue #3282. 
(projector autoupdate problem by deleting projected object)
 2017-06-01 14:57:33 +02:00
Emanuel Schütze
b48c850e79 Removed empty <span> tags in ckeditor. 2017-05-31 21:35:32 +02:00
FinnStutzenstein
8cd22daff3 Fixed missing styles of headings in motion pdf. 
Also some refactoring/clean up of pdf code.
 2017-05-29 13:03:12 +02:00
Emanuel Schütze
1b6dd93e6e Merge pull request #3268 from emanuelschuetze/pdf-issue 
Fixed formatting errors in motion pdf (Fixed #3228).
 2017-05-23 22:52:31 +02:00
Emanuel Schütze
eee0e0fc06 Fixed formatting errors in motion pdf (Fixed #3228). 
for diff view
 2017-05-23 22:42:14 +02:00
Emanuel Schütze
b9a115d3b8 Merge pull request #3266 from normanjaeckel/RenameFunction 
Renamed is_user_data_required to required_users. Fixed #3238.
 2017-05-23 22:31:28 +02:00
Norman Jäckel
913bec3e53 Renamed is_user_data_required to required_users. Fixed #3238. 2017-05-22 16:08:52 +02:00
Norman Jäckel
f4c30da4a2 Removed old poll code snippets. Fixed #3179. 2017-05-22 15:51:55 +02:00
Emanuel Schütze
32610e552c Changed PdfImageConverter to ImageConverter (Fixed #3263). 2017-05-21 22:20:57 +02:00
FinnStutzenstein
e7da35398d Export personal note and comments in PDFs. 2017-05-19 14:31:58 +02:00
Emanuel Schütze
8abfe91853 Merge pull request #3258 from FinnStutzenstein/docx 
Rework docx parser, add comments to docx
 2017-05-19 14:02:29 +02:00
FinnStutzenstein
f4c4f2553b Rework docx parser, add comments to docx 2017-05-19 13:55:09 +02:00
FinnStutzenstein
e396347e00 Also notify users when they inline edit a motion (fixes #2360) 2017-05-19 13:21:19 +02:00
Emanuel Schütze
3b2c7634f0 Merge pull request #3256 from FinnStutzenstein/Issue3243 
extending the color parser (fixes #3243)
 2017-05-19 08:46:32 +02:00
Norman Jäckel
94aceeffab Merge pull request #3237 from tsiegleauq/issue3180-scale-images 
enables pdf image scaling for CKEditor
 2017-05-18 21:34:06 +02:00
Tobias Hößl
7109c75246 Remove color styles insert .insert/.delete-Paragraphs - fixes #3247 2017-05-17 21:38:35 +02:00
FinnStutzenstein
a23e263dcb extending the color parser (fixes #3243) 2017-05-17 09:13:10 +02:00
FinnStutzenstein
91882f1d13 Improve zip creation and fixing page numbers 2017-05-17 07:54:35 +02:00
Emanuel Schütze
6eec735c8e Merge pull request #3252 from FinnStutzenstein/PdfZipFilenames 
Fixing PDF filenames on zip export if no identifier is given
 2017-05-16 20:58:28 +02:00
Emanuel Schütze
d5b9a5c590 Merge pull request #3244 from normanjaeckel/Fix3242 
Removed default permissions for personal note. Updated Yarn lock. Fix…
 2017-05-16 20:26:01 +02:00
Emanuel Schütze
c2a271c422 Merge pull request #3254 from emanuelschuetze/Issue3229-Broken-HTML 
Detect broken HTML after diff (Fixed #3229)
 2017-05-16 14:25:00 +02:00
Tobias Hößl
b340256541 Detect broken HTML after diff (Fixed #3229) 2017-05-16 12:19:18 +02:00
Emanuel Schütze
f46ad742e3 Merge pull request #3230 from FinnStutzenstein/Issue3219 
Cleanup MotionUpdateCtrl (fixes #3219)
 2017-05-15 14:17:55 +02:00
Emanuel Schütze
e0661e7343 Merge pull request #3248 from FinnStutzenstein/ExportDialogFilename 
Fixing error when downloading
 2017-05-15 13:45:07 +02:00
Emanuel Schütze
601e2ea2b5 Merge pull request #3249 from FinnStutzenstein/MediafilePdfPageFix 
Fixing page controls in mediafiles list view
 2017-05-15 13:41:50 +02:00
FinnStutzenstein
d1f0b69d35 Fixing PDF filenames on zip export if no identifier is given 2017-05-12 12:02:01 +02:00
FinnStutzenstein
8f070ffaa1 Fixing user list pdf 2017-05-11 12:47:01 +02:00
sean
eb259dc5e2 enables pdf image scaling for CKEditor 2017-05-10 13:50:52 +02:00
FinnStutzenstein
90c8ce5bf0 Fixing page controls in mediafiles list view 2017-05-10 09:26:31 +02:00
FinnStutzenstein
17d9615631 Fixing error when downloading 2017-05-10 09:04:19 +02:00
Norman Jäckel
754116cdca Removed default permissions for personal note. Updated Yarn lock. Fixed #3242. 2017-05-09 13:49:56 +02:00
Norman Jäckel
2833341867 Merge pull request #3235 from tsiegleauq/issue3231-long-lines-in-lists 
fix long lines in pdf list (fixes #3231)
 2017-05-08 13:06:48 +02:00
Norman Jäckel
db1d087aa0 Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction 
Bugfix: whitespaces were disturbing line extraction - fixes #3226
 2017-05-08 13:06:13 +02:00
sean
37b96bb0bc fix long lines in pdf list (fixes #3231) 2017-05-07 22:01:50 +02:00
FinnStutzenstein
118cff6964 Fixing wrong err call 2017-05-05 17:25:34 +02:00
Norman Jäckel
ebabc291c5 Refactoring of data parsing for startup and autoupdate. 2017-05-03 08:58:29 +02:00
Oskar Hahn
4963bfa7bf Changed restricted data parsing. Cached full data on startup. 2017-05-01 21:52:16 +02:00
Tobias Hößl
b0a569fdf3 Bugfix: whitespaces were disturbing line extraction 2017-05-01 15:55:51 +02:00
FinnStutzenstein
adb5185fcc Cleanup MotionUpdateCtrl (fixes #3219) 2017-04-28 14:18:29 +02:00
FinnStutzenstein
239d56f350 Fixing PDF in IE11 (fixes #3206, fixes #3217) 2017-04-28 13:16:46 +02:00
Emanuel Schütze
c7c7bfca9c Merge pull request #3222 from emanuelschuetze/translations 
Updated German translations.
 2017-04-27 15:38:10 +02:00
Emanuel Schütze
dd99be5e69 Merge pull request #3221 from normanjaeckel/ChangeKeyError 
Fixed error for internal function get_model_from_collection_string.
 2017-04-27 15:34:39 +02:00
Emanuel Schütze
a77a4edb75 Merge pull request #3220 from normanjaeckel/CleanUp 
Removed unused lines.
 2017-04-27 15:33:42 +02:00
Emanuel Schütze
0cc4b0c578 Updated German translations. 2017-04-27 15:26:35 +02:00
Norman Jäckel
4bdb06bd9b Fixed error for internal function get_model_from_collection_string. 2017-04-27 15:16:07 +02:00
Norman Jäckel
9781c0b73b Removed unused lines. 2017-04-27 15:09:42 +02:00
Emanuel Schütze
941ac8809e Merge pull request #3208 from tsiegleauq/logos-in-pdf 
add logos in PDF
 2017-04-27 15:08:36 +02:00
Emanuel Schütze
9387f83f8a Merge pull request #3212 from normanjaeckel/Notify 
Added notify system.
 2017-04-27 15:07:15 +02:00
Emanuel Schütze
11aacc71b6 Merge pull request #3216 from ostcar/early_websocket_open 
Open websocket connections immediately
 2017-04-27 13:13:00 +02:00
FinnStutzenstein
349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
Emanuel Schütze
7c8bc935f8 Show pdf footer logo. Fixed layout. 2017-04-27 12:58:11 +02:00
FinnStutzenstein
fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +02:00
Sean Engelhardt
2b94dc5942 Added configurable header and footer logos for PDF. 2017-04-27 12:58:11 +02:00
Oskar Hahn
74c1cc63dc Open websocket connections immediately 
Also made a performance boost to get_model_from_collection_string()
 2017-04-27 12:54:16 +02:00
Norman Jäckel
bd68997a5d Added notify system. 2017-04-27 09:30:02 +02:00
FinnStutzenstein
96899f63cc Personal note (client side) 2017-04-27 09:10:46 +02:00
Norman Jäckel
6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Emanuel Schütze
4cd9d20435 Improved motion catalog pdf for one/mutliple motions. 2017-04-24 14:53:42 +02:00
Emanuel Schütze
9ebf3509c0 Updated translation files and German translation. 2017-04-24 10:44:32 +02:00
Emanuel Schütze
b06f10dea8 Merge pull request #3210 from FinnStutzenstein/SpeakerSort 
Fixing issue when sorting a new inserted speaker
 2017-04-24 09:54:51 +02:00
FinnStutzenstein
7d1b65429e Fixing issue when sorting a new inserted speaker. 2017-04-24 09:45:53 +02:00
Sean Engelhardt
3cb07c97dc Added more distance in motion PDF for DEL-tags in new lines (fixes #3205). 2017-04-24 09:43:18 +02:00
Norman Jäckel
24e7d42f6f Merge pull request #3207 from FinnStutzenstein/LogoHeader 
Configurable projector header
 2017-04-21 22:09:18 +02:00
Emanuel Schütze
8c4ec1c218 Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching 
Bugfix: changing line length did not invalidate cache
 2017-04-19 15:03:48 +02:00
FinnStutzenstein
61058fac49 Configurable projector header image 2017-04-19 14:54:31 +02:00
Tobias Hößl
9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel
8380e97f93 Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks 
Add a parameter 'lineBreaks' to getTextByMode
 2017-04-19 14:45:24 +02:00
Emanuel Schütze
3614ba9451 Fixed compare of duplicated users while csv user import. 2017-04-19 13:38:06 +02:00
FinnStutzenstein
d78a7f91bc Fix clearing empty chat messages (fixes #3192) 2017-04-19 08:00:18 +02:00
Tobias Hößl
a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +02:00
Norman Jäckel
21418f632f Added support for password validation using Django or custom validators e. g. for minimum password length. 2017-04-13 16:20:38 +02:00
Emanuel Schütze
7d2785b9ec Merge pull request #3189 from FinnStutzenstein/pdf-zip 
Pdf zip
 2017-04-13 11:54:19 +02:00
Emanuel Schütze
768cc5f711 Merge pull request #3196 from emanuelschuetze/motionCommentRegression 
Fixed regression that opening of motion create form failed.
 2017-04-12 20:12:57 +02:00
Emanuel Schütze
cbccd17752 Fixed translation strings and updated German translations. 2017-04-12 20:03:07 +02:00
FinnStutzenstein
845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze
d1ff1e540f Fixed regression that opening of motion create form failed. 
Introduced with commit 3de4a2af1c.
 2017-04-12 15:17:47 +02:00
Emanuel Schütze
6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert 
Add local convert to Base64 (Fixes #2705)
 2017-04-12 15:09:43 +02:00
Sean Engelhardt
65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
Emanuel Schütze
2be9d45884 Merge pull request #3184 from FinnStutzenstein/Logo 
Support logos
 2017-04-12 14:49:59 +02:00
FinnStutzenstein
6c932aa77a Support logos 2017-04-12 14:28:46 +02:00
Emanuel Schütze
b9bab6fc17 Merge pull request #3191 from normanjaeckel/FreeUser 
User without permission to see users can now see some of them.
 2017-04-12 10:20:48 +02:00
Norman Jäckel
c4ec26c4c0 User without permission to see users can now see some required users. 
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
 2017-04-11 17:10:49 +02:00
Emanuel Schütze
3de4a2af1c Fixed empty motion comment field in motion update form. 
Motion comment values were not extracted. Concerns edit button in
motion list view only.
 2017-04-11 17:08:19 +02:00
Emanuel Schütze
23fec417f8 Fixed sorting of last speakers. 2017-04-11 15:55:45 +02:00
Norman Jäckel
cf9d204e18 Merge pull request #3187 from FinnStutzenstein/Issue3186 
Fixes #3060, fixes #3186.
 2017-04-07 16:47:42 +02:00
FinnStutzenstein
c86f6d3684 Do not reload on logout (fixes #2868) 2017-04-07 16:22:32 +02:00
FinnStutzenstein
cefdabc3d7 fixes #3060, fixes #3186 2017-04-07 15:16:09 +02:00
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze
1d1bf7366f Update version to 2.1.2-dev 2017-04-05 20:31:42 +02:00
Emanuel Schütze
bbbad71e2d Release 2.1.1 2017-04-05 20:30:07 +02:00
Norman Jäckel
757bbc62e5 Added version to getgeiss command. 2017-04-03 13:41:48 +02:00
FinnStutzenstein
44ed866210 fixes #3173 2017-03-31 12:28:13 +02:00
Norman Jäckel
7f55bc9377 Update version to 2.1.1-dev 2017-03-29 14:34:17 +02:00
Norman Jäckel
0086b513d0 Release 2.1 2017-03-29 14:33:00 +02:00
Emanuel Schütze
6d7f121a7f Merge pull request #3167 from emanuelschuetze/translations 
Updated final 2.1 translations for CS, ES, FR, PT, RU
 2017-03-29 14:30:02 +02:00
Emanuel Schütze
861e9674b8 Updated final 2.1 translations for CS, ES, FR, PT, RU 2017-03-29 14:25:02 +02:00
Emanuel Schütze
bb74e7eaa9 Merge pull request #3165 from normanjaeckel/MotionCreateFix 
Fixed creating motion for users with comments permissions.
 2017-03-28 21:13:39 +02:00
Norman Jäckel
4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Emanuel Schütze
9e96db894c Merge pull request #3159 from FinnStutzenstein/Issue3140 
fixing validate_html and motion saving (fixes #3140)
 2017-03-28 19:44:52 +02:00
FinnStutzenstein
d9e3da87f5 fixing validate_html and motion saving (fixes #3140) 
using PATCH
 2017-03-28 19:39:06 +02:00
Emanuel Schütze
ba4a408f5e Merge pull request #3156 from emanuelschuetze/issue-3099 
Disable edit button and hide remove button if election is finished.
 2017-03-28 14:47:09 +02:00
Emanuel Schütze
7ab95773eb Disable edit button and hide remove button if election is finished. (Fixed #3099) 2017-03-28 14:29:32 +02:00
Norman Jäckel
0ab2503fdc Merge pull request #3162 from FinnStutzenstein/assignmentOrder 
Fixing order for assignment poll form and translation for slide (fixe…
 2017-03-28 13:39:09 +02:00
Emanuel Schütze
c4a4773074 Merge pull request #3157 from normanjaeckel/FixDeletedReferenceProjector 
Fixed bug when reference projector for list of speakers slide is dele…
 2017-03-28 10:06:12 +02:00
FinnStutzenstein
72ceac3510 Fixing order for assignment poll form and translation for slide (fixes #3160, fixes #3161) 2017-03-28 09:58:02 +02:00
Norman Jäckel
619fc29cd4 Delete a file from filesystem when mediafile is deleted/destroied via REST api. Fixed #3146. 2017-03-28 00:17:55 +02:00
Norman Jäckel
d6af67d1df Fixed bug when reference projector for list of speakers slide is deleted. Fixed #3076. 2017-03-27 23:53:35 +02:00
Norman Jäckel
bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Norman Jäckel
9ffb008eb0 Merge pull request #3154 from emanuelschuetze/issue-3151 
Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151).
 2017-03-27 12:31:52 +02:00
Norman Jäckel
c741ddb909 Merge pull request #3155 from emanuelschuetze/issue3144 
Fixed wrong cancel function in mediafile form. (Fixed #3144)
 2017-03-27 12:25:24 +02:00
Emanuel Schütze
f971696130 Fixed wrong cancel function in mediafile form. (Fixed #3144) 2017-03-27 11:19:06 +02:00
Emanuel Schütze
fa76cb2866 Fixed linebreaks in pdf. 2017-03-27 11:17:04 +02:00
Emanuel Schütze
461be41a64 Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151). 
To remove the 'contextmenu' plugin also the 'liststyle' and 'tabletools' plugins
have to removed.
 2017-03-27 10:09:27 +02:00
Tobias Hößl
0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Tobias Hößl
d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel
33a61cb340 Merge pull request #3139 from emanuelschuetze/diff-mode-pdf 
Cleanup pdf parsing code for indentation fix in diff mode.
 2017-03-24 14:50:46 +01:00
Norman Jäckel
4964c2e84e Merge pull request #3138 from FinnStutzenstein/CountdownBug 
Fixing countdown default time
 2017-03-24 14:50:35 +01:00
Norman Jäckel
359ad0f60c Merge pull request #3137 from FinnStutzenstein/Issue3053 
watch for projector resolution change (fixes #3053)
 2017-03-24 14:47:09 +01:00
Norman Jäckel
85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103 
Improving creation of ballots (fixes #3103)
 2017-03-24 14:46:25 +01:00
Emanuel Schütze
9472eec69b Cleanup pdf parsing code for indentation fix in diff mode. 2017-03-24 09:35:13 +01:00
FinnStutzenstein
7eef45cd51 Fixing countdown default time 2017-03-24 09:23:28 +01:00
FinnStutzenstein
ab245b86a8 watch for projector resolution change (fixes #3053) 2017-03-24 08:46:18 +01:00
FinnStutzenstein
0220a03350 fixing test and inform_changed_data call 2017-03-24 08:14:08 +01:00
Norman Jäckel
5cd3b73725 Merge pull request #3135 from emanuelschuetze/projector-scroll-direction 
Switch projector scroll direction
 2017-03-23 23:24:02 +01:00
Norman Jäckel
e93a2f9f8e Merge pull request #3134 from normanjaeckel/IdentifierWahnsinn 
Fixed bug when creating multiple motions at once (problem with unique…
 2017-03-23 23:23:40 +01:00
Emanuel Schütze
57025b9792 Switch projector scroll direction 
- button 'arrow down': moves the visible part of the projector down
  (forward = text scrolls from bottom to top)
- button 'arrow up': moves the visible part of the projector up
  (backward = text scrolls from top to bottom)

Reverts change from #3094.
 2017-03-23 10:51:40 +01:00
Norman Jäckel
ced3f6d697 Fixed bug when creating multiple motions at once (problem with unique motion identifier). Fixed #3062. 2017-03-23 00:47:41 +01:00
Norman Jäckel
f34c24947a Merge pull request #3133 from emanuelschuetze/order-summary 
Fixed wrong order of change recommendations in summary box in PDF.
 2017-03-23 00:27:47 +01:00
Norman Jäckel
cd105f2271 Merge pull request #3132 from CatoTH/pdf-inline-diff-remove-extra-spaces 
Remove erroneous margin around inline diff paragraphs in PDF
 2017-03-23 00:27:27 +01:00
Norman Jäckel
5d074136be Merge pull request #3131 from tsiegleauq/change-reco-pdf-paragraphs 
adjust indentation for new insertions in PDF
 2017-03-23 00:26:25 +01:00
Emanuel Schütze
bd5ccb62ba Fixed wrong order of change recommendations in summary box in PDF. 2017-03-22 22:14:07 +01:00
sean
8324dbba16 adjust indentation for new insertions in PDF 2017-03-22 21:57:56 +01:00
Tobias Hößl
45cac43193 Remove erroneous margin around inline diff paragraphs in PDF 2017-03-22 20:54:56 +01:00
Emanuel Schütze
e5028f7ef2 Merge pull request #3127 from emanuelschuetze/issue3112 
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, #3038)
 2017-03-22 15:54:38 +01:00
Emanuel Schütze
2571d83195 Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, fixed #3038). 
- Provided csv header fields as meta data while csv import (#3038).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
 2017-03-22 15:37:08 +01:00
Emanuel Schütze
0c3ecb0acb Merge pull request #3129 from tsiegleauq/issue2811-more-parsing-issues 
fix pdf style parsing issue (fixes #2811)
 2017-03-22 15:28:05 +01:00
sean
bb5394eb36 fix pdf style parsing issue (fixes #2811) 2017-03-22 14:57:08 +01:00
Norman Jäckel
4f3fdf1699 Merge pull request #3125 from CatoTH/pass-line-numbers-through-diff 
Beginning: passing line numbers through the diff
 2017-03-22 14:24:23 +01:00
Emanuel Schütze
b6e1b3fc67 Updated translations (Fixed #2955) 2017-03-22 12:52:11 +01:00
Tobias Hößl
c912811bd3 Beginning: passing line numbers through the diff 2017-03-22 12:21:45 +01:00
Norman Jäckel
6b253ef4b7 Merge pull request #3124 from emanuelschuetze/tooltip 
Fixed hidden tooltip content in motion toolbar.
 2017-03-22 10:57:51 +01:00
Emanuel Schütze
af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +01:00
Emanuel Schütze
19d16a1ea7 Show username if first and last name is empty (Fixed #3121) 2017-03-22 09:13:33 +01:00
Emanuel Schütze
869105dc40 Minor fixes 
- Added motion change recommendations to full text search.
- Show csv/docx export entries in list views for manager only.
 2017-03-22 08:47:32 +01:00
Norman Jäckel
861df5f5c1 Merge pull request #3120 from emanuelschuetze/diff-box 
Hide change recommendation diff-box in diff version for normal users.
 2017-03-21 23:05:02 +01:00
Norman Jäckel
e57afb9ab4 Merge pull request #3118 from emanuelschuetze/issue3081 
Allow style attributes for about field in user detail template (Fixed #3081)
 2017-03-21 23:03:27 +01:00
Emanuel Schütze
70de0a6e4b Hide change recommendation diff-box in diff version for normal users. 2017-03-21 20:47:58 +01:00
Norman Jäckel
b7d3acc94b Merge pull request #3114 from emanuelschuetze/assignment-fixes 
Fixed assignment JS bugs (Fixed #3099)
 2017-03-21 17:28:03 +01:00
Norman Jäckel
c39d003f01 Merge pull request #3113 from FinnStutzenstein/assignment-tabs 
Fixes Ballot tabs on create/delete (fixes #3058)
 2017-03-21 17:22:15 +01:00
Norman Jäckel
a412ff9eb3 Merge pull request #3094 from FinnStutzenstein/Issue3092 
Fixes #3092, fixes #2453 and fixed motion projection bug
 2017-03-21 17:20:49 +01:00
Norman Jäckel
bd8c7f61a0 Merge pull request #3085 from tsiegleauq/issue3025-duplicated-header 
fix double PDF Head in Motions (fixes #3025)
 2017-03-21 17:19:36 +01:00
Emanuel Schütze
0036029709 Fixed double paragraphs in motion pdf which contains links (Fixed #3095). 2017-03-21 16:08:39 +01:00
Emanuel Schütze
74811a4529 Allow style attributes for about field in user detail template (Fixed #3081) 2017-03-21 15:19:22 +01:00
Emanuel Schütze
bfa8076862 Updated German translations (Fixed #3079) 2017-03-21 14:55:14 +01:00
FinnStutzenstein
a0531a3268 Fixes Ballot tabs on create/delete (fixes #3058) 2017-03-21 14:37:10 +01:00
FinnStutzenstein
4f84a9f752 Fixes #3092, fixes #2453 and fixed motion projection bug 2017-03-21 14:29:06 +01:00
Emanuel Schütze
0852c14524 Updated translations (EN+DE). 2017-03-21 14:09:20 +01:00
Emanuel Schütze
0082410cc8 Fixed assignment JS bugs (Fixed #3099) 2017-03-21 13:57:48 +01:00
FinnStutzenstein
08bd1251a7 More speed improvements 2017-03-21 11:08:52 +01:00
Emanuel Schütze
b8742bcb8f Merge pull request #3061 from FinnStutzenstein/Issue3036 
Let users with comments management perms edit them (fixes #3036)
 2017-03-21 10:49:13 +01:00
FinnStutzenstein
238b4b7f0a Improving creation of ballots (fixes #3103) 2017-03-21 10:33:36 +01:00
FinnStutzenstein
a638b05538 Let users with comments management perms edit them (fixes #3036), fixes #3090 2017-03-21 09:59:49 +01:00
Norman Jäckel
42cf987aed Merge pull request #3096 from CatoTH/Issue3077-highlight-inline-diff 
Add an explicit line highlighting function for the diff
 2017-03-20 22:09:18 +01:00
Tobias Hößl
a3c7eeb091 Add an explicit line highlighting function for the diff 2017-03-18 15:24:19 +01:00
FinnStutzenstein
542cb67d59 Fixing the sidebar, fixes #3068 2017-03-17 12:24:40 +01:00
Sean Engelhardt
259e338b17 fix double PDF Head in Motions (fixes #3025) 2017-03-16 23:17:25 +01:00
Emanuel Schütze
b53843c17e Several template fixes 
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
 2017-03-10 22:46:01 +01:00
Emanuel Schütze
26c9937220 Merge pull request #3075 from emanuelschuetze/issue3066 
Fixed autoupdate error after deleting a slide (Fixed #3066).
 2017-03-09 08:58:24 +01:00
Emanuel Schütze
1be2cbb8dc Fixed autoupdate error after deleting a slide (Fixed #3066). 2017-03-09 08:51:57 +01:00
Norman Jäckel
07faf1078b Merge pull request #3074 from emanuelschuetze/fixes2 
Hide empty placeholder of ui-tree in sort templates.
 2017-03-09 00:05:28 +01:00
Emanuel Schütze
780b9e2e9a Hide empty placeholder of ui-tree in sort templates. 2017-03-08 23:07:22 +01:00
Norman Jäckel
82e20ee5a7 Merge pull request #3073 from emanuelschuetze/fixes 
Minor template fixes
 2017-03-08 23:00:26 +01:00
Norman Jäckel
27bc6a7df4 Merge pull request #3072 from CatoTH/fix-diff-test-cases 
Fixes broken diff test cases
 2017-03-08 22:51:37 +01:00
Emanuel Schütze
3717f63d12 Minor template fixes 
- More column width in all-motions pdf.
  Order categories by prefix.
- Fixed using translations in error messages.
  Removed unused pdf-status template.
 2017-03-08 22:46:45 +01:00
Tobias Hößl
c3bd85e5ee Diff-Bugfix: don't repeat unchanged words 2017-03-08 21:29:34 +01:00
Tobias Hößl
a6de228f56 Prevent broken HTML like <ins>Test</p></ins> 2017-03-08 20:38:02 +01:00
Tobias Hößl
9f71afa602 Fixes broken diff test cases + Bugfix for: TypeError: Failed to execute 'insertBefore' on 'Node' 2017-03-08 20:10:32 +01:00
Sean Engelhardt
6dc52c6fe2 Add strike command to HTML PDF parser (Fixes #3069) 2017-03-08 15:47:40 +01:00
Emanuel Schütze
f457720d29 Update version to 2.1b5-dev 2017-03-07 21:22:53 +01:00
Emanuel Schütze
c788e3bfab Release 2.1b4 2017-03-07 21:19:31 +01:00
FinnStutzenstein
cc0049b55b Adding agenda/topics app, fixes user app 2017-03-07 15:02:39 +01:00
Norman Jäckel
14ec6c0f44 Improved autoupdate on permission change. 2017-03-06 17:42:27 +01:00
FinnStutzenstein
bcc85f9cad Autoupdate on user permission change. 2017-03-06 15:08:23 +01:00