Emanuel Schütze
432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent
...
Do not zoom slideheaders
2017-11-03 12:33:42 +01:00
FinnStutzenstein
323534700c
Do not zoom slideheaders
2017-11-03 12:17:29 +01:00
Emanuel Schütze
5558ba3fc6
Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView
...
Showing the number of next speakers in motion list view
2017-11-03 10:55:13 +01:00
Emanuel Schütze
969274faf3
Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector
...
hide 'undefined' error message
2017-11-03 10:47:49 +01:00
Emanuel Schütze
4cbf7d6c9f
Merge pull request #3469 from FinnStutzenstein/CountdownRace
...
Bundle autoupdates for beginning a speech
2017-11-03 10:47:22 +01:00
FinnStutzenstein
1236fee7ee
Showing the number of next speakers in motion list view
2017-11-03 10:29:34 +01:00
FinnStutzenstein
834ed77a2c
Bundle autoupdates for beginning a speech
2017-11-03 10:27:45 +01:00
FinnStutzenstein
84f755a6e5
hide 'undefined' error message
2017-11-03 10:25:22 +01:00
Emanuel Schütze
3706a36051
Updated German translations.
2017-11-03 09:16:08 +01:00
Tobias Hößl
e18f22f200
Break lines in nodes that have already been parsed
2017-11-02 09:16:36 +01:00
Emanuel Schütze
c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff
...
Better handling of inserted paragraphs
2017-11-02 09:11:28 +01:00
FinnStutzenstein
5e8662e470
Motion optimizations
2017-11-02 08:50:33 +01:00
Tobias Hößl
6891471c45
Better handling of inserted paragraphs
2017-11-01 10:29:18 +01:00
Emanuel Schütze
a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle
...
Show motion identifier in (current) list of speakers
2017-11-01 10:23:19 +01:00
FinnStutzenstein
39bd6653f0
Show motion identifier in (current) list of speakers
2017-11-01 09:58:22 +01:00
Norman Jäckel
6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2
...
try/catch for inconsistent data
2017-10-29 17:59:18 +01:00
Norman Jäckel
452ecfbbd0
Merge pull request #3454 from FinnStutzenstein/UserFormFix
...
Fixed user form for groups with ids greater than 9
2017-10-29 17:57:18 +01:00
Norman Jäckel
e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy
...
Update state field when following a recommendation
2017-10-29 17:53:30 +01:00
Norman Jäckel
50bed94249
Merge pull request #3463 from FinnStutzenstein/PdfListstyle
...
Implement list styles in pdf (fixes #3338 )
2017-10-29 17:52:59 +01:00
Emanuel Schütze
b50d5e10ee
Added '!' as new split separator for better motion diff view.
2017-10-27 14:50:38 +02:00
FinnStutzenstein
78f5d1f516
Implement list styles in pdf ( fixes #3338 )
2017-10-27 14:35:09 +02:00
FinnStutzenstein
1c508765fa
Update state field when following a recommendation
2017-10-27 12:36:31 +02:00
Tobias Hößl
5fd8741fdb
try/catch for inconsistent data
2017-10-24 20:06:04 +02:00
FinnStutzenstein
f479a7a1ab
Fixed user form for groups with ids greater than 9
2017-10-24 10:23:49 +02:00
Norman Jäckel
73407133bd
Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange
...
Go to top on a page change
2017-10-22 15:35:12 +02:00
Norman Jäckel
d175e4a200
Merge pull request #3452 from FinnStutzenstein/Plugin
...
Added TemplateHooks for the protocol plugin.
2017-10-19 21:21:49 +02:00
FinnStutzenstein
9c657016e3
Added TemplateHooks for the protocol plugin.
2017-10-18 11:35:22 +02:00
Emanuel Schütze
4ff7d0b7dc
Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio
...
Disable change ratio detection / Fix marking unchanged dangling line as changed
2017-10-16 13:05:35 +02:00
Tobias Hößl
e651c124e4
Disable change ratio detection / Fix for marking unchanged line as changed
2017-10-16 12:27:44 +02:00
Emanuel Schütze
5eda3131a8
Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements
...
Motion template improvements (Fixed #3303 )
2017-10-16 12:10:00 +02:00
Emanuel Schütze
c02f00da7d
Merge pull request #3446 from FinnStutzenstein/Identifier
...
New motion identifier behavior
2017-10-16 12:08:53 +02:00
Emanuel Schütze
17959bd9c5
Motion template improvements ( Fixed #3303 )
...
- Sort categories drop downs by config value (name or prefix) (fixed #3303 ).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
2017-10-16 09:35:06 +02:00
Emanuel Schütze
721064700a
Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove
...
Move comments filter behind motion block filter
2017-10-13 23:38:45 +02:00
Norman Jäckel
611776d38c
Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth
...
Limit the reason display width
2017-10-13 18:35:47 +02:00
Norman Jäckel
cd2316652d
Merge pull request #3443 from FinnStutzenstein/ResetCountdown
...
Reset Countdown when a speech was ended
2017-10-13 18:23:34 +02:00
Norman Jäckel
9b64bd5646
Merge pull request #3438 from FinnStutzenstein/PDF
...
Fixing multiline headers in PDF
2017-10-13 18:21:34 +02:00
Norman Jäckel
487b286b79
Merge pull request #3436 from FinnStutzenstein/Remarks
...
Fixed all remarks
2017-10-13 18:20:45 +02:00
FinnStutzenstein
5b9933e930
Move comments filter behind motion block filter
2017-10-13 14:25:31 +02:00
FinnStutzenstein
1da34f744f
New motion identifier behavior
2017-10-13 14:06:01 +02:00
FinnStutzenstein
5f45e2d748
Fixed all remarks
2017-10-13 12:02:23 +02:00
FinnStutzenstein
96cd3405aa
Go to top on a page change
2017-10-13 11:46:41 +02:00
FinnStutzenstein
6584c7b035
Limit the reason display width
2017-10-13 11:16:01 +02:00
FinnStutzenstein
256c12af8e
Reset Countdown when a speech was ended
2017-10-13 11:13:31 +02:00
Norman Jäckel
3c9ae628e8
Merge pull request #3439 from FinnStutzenstein/PdfInsertFix
...
Fixed indention of inserted paragraphes
2017-10-12 20:29:41 +02:00
Tobias Hößl
a09a12c55c
Diff: use comma as a word separator
2017-10-11 22:15:12 +02:00
FinnStutzenstein
fc185e2eeb
Fixing multiline headers in PDF
2017-10-11 14:21:35 +02:00
FinnStutzenstein
b8e23e6a4f
Fixed indention of inserted paragraphes
2017-10-11 14:04:31 +02:00
Emanuel Schütze
84e2ec2a29
Updated German translations.
2017-10-05 13:33:32 +02:00
Emanuel Schütze
18d138ebf1
Merge pull request #3433 from emanuelschuetze/layoutIssues
...
Fixed minor layout issues on projector and pdf.
2017-10-05 13:29:38 +02:00
Emanuel Schütze
886d76ff06
Merge pull request #3432 from emanuelschuetze/additionalOptions
...
Added new motion configs to hide reason/recommendation on projector.
2017-10-05 13:29:12 +02:00
Emanuel Schütze
02857bdbf1
Fixed minor layout issues on projector and pdf.
...
Especially for motion diff view.
2017-10-05 13:05:49 +02:00
Emanuel Schütze
0a04ee0716
Added new motion configs to hide reason/recommendation on projector.
2017-10-05 12:54:40 +02:00
FinnStutzenstein
46364a84e1
Generate webclient-realm.js while collecting staticfiles ( fixes #3422 )
2017-10-04 12:26:30 +02:00
Emanuel Schütze
de9c54513d
Merge pull request #3430 from FinnStutzenstein/AgendaFix
...
Fixed projecting subitems
2017-09-28 11:40:47 +02:00
FinnStutzenstein
343ddf5ac5
Fixed projecting subitems
2017-09-28 11:33:33 +02:00
FinnStutzenstein
2ba1fe2a0f
Instructions for using Nginx in big mode
2017-09-28 09:35:05 +02:00
FinnStutzenstein
5862e054e3
Naive projector prioritization
2017-09-27 14:46:16 +02:00
Emanuel Schütze
c269ae5cf8
Merge pull request #3419 from FinnStutzenstein/ViewCaching
...
Index and Webclient View caching
2017-09-27 13:21:46 +02:00
FinnStutzenstein
178948b269
Index and Webclient View caching
2017-09-27 12:50:59 +02:00
Emanuel Schütze
231a056790
Merge pull request #3418 from FinnStutzenstein/ServeLogos
...
Serve Logos
2017-09-27 10:52:29 +02:00
Emanuel Schütze
0b10933d67
Merge pull request #3417 from FinnStutzenstein/HidePassword
...
Hide password in change password view
2017-09-27 10:52:09 +02:00
FinnStutzenstein
6f33c8a866
Fixing motion comments ( fixes #3420 )
2017-09-27 09:20:07 +02:00
FinnStutzenstein
841383d414
Serve Logos
2017-09-26 10:56:43 +02:00
FinnStutzenstein
ab08708ec1
Hide password in change password view
2017-09-26 09:03:05 +02:00
FinnStutzenstein
aa13e5ddd0
Fixing special comments fields, reconnect timeout, minor things.
2017-09-22 13:45:52 +02:00
Emanuel Schütze
6f3e2a74f8
Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines
...
Line break algorithm should not be distracted by newline characters
2017-09-21 16:35:14 +02:00
Emanuel Schütze
c68688c2ff
Merge pull request #3414 from FinnStutzenstein/Fixes
...
Motion comments fix and close open dialogs if a relogin is necessary
2017-09-21 16:29:32 +02:00
Tobias Hößl
ee37cfed9c
Line break algorithm should not be distracted by newline characters
...
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
2017-09-21 16:24:54 +02:00
FinnStutzenstein
a4ae174a94
Fixing motion access permissions
2017-09-21 12:43:07 +02:00
FinnStutzenstein
31708df436
Motion comments fix and close open dialogs if a relogin is necessary
2017-09-20 07:34:57 +02:00
Emanuel Schütze
61f59b962d
Merge pull request #3411 from emanuelschuetze/stylistic-remarks
...
Fixed two stylistic remarks.
2017-09-18 11:16:39 +02:00
Emanuel Schütze
e313731c9e
Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed
...
Inline-Diff when the first word in a paragraph is replaced - fixes #3401
2017-09-18 11:15:52 +02:00
Tobias Hößl
8650bc0401
Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401
2017-09-18 11:05:00 +02:00
Emanuel Schütze
6f4d122e0f
Fixed two stylistic remarks.
2017-09-18 09:40:57 +02:00
Tobias Hößl
da8f825d42
Sort attributes before applying the diff - fixes #3402
2017-09-16 14:06:12 +02:00
Emanuel Schütze
b824e0387c
Merge pull request #3390 from ostcar/rewrite_restricted_data
...
CollectionElement and Autoupdate cleanups to help mypy
2017-09-15 12:23:50 +02:00
Oskar Hahn
d7db714562
CollectionElement and Autoupdate cleanups
...
* change get_restricted_data and get_projector_data to always use a list
* Add typings to all get_restricted_data and get_projector_data methods
* Replace CollectionElementList with a real list
* Fixed arguments of inform_deleted_data
* Moved CollectionElementCache to cache.py and refactored it
* Run tests with cache enabled (using fakeredis)
2017-09-15 12:11:32 +02:00
Emanuel Schütze
483410fe0c
Updated German translations.
2017-09-15 12:08:26 +02:00
Emanuel Schütze
4565e7e4a6
Merge pull request #3400 from FinnStutzenstein/UserAutoupdate
...
Autoupdates on user login (fixes #3395 , fixes #3392 )
2017-09-15 11:48:35 +02:00
FinnStutzenstein
c580ee4c8d
Goto top link, improved title, stylistic changes, and more
2017-09-15 11:06:19 +02:00
Emanuel Schütze
2c4a1d5a6c
Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework
...
Rework on motion comments.
2017-09-15 10:59:02 +02:00
Emanuel Schütze
83f67b23c9
Merge pull request #3403 from ostcar/optional_restricted_data_cache
...
Make RestrictedDataCache optional
2017-09-15 10:56:22 +02:00
FinnStutzenstein
16abfd0dbf
Autoupdates on user login ( fixes #3395 , fixes #3392 )
2017-09-15 10:40:04 +02:00
Oskar Hahn
faf44602cb
Make RestrictedDataCache optional
2017-09-15 09:55:21 +02:00
Norman Jäckel
0eccd78b78
Merge pull request #3384 from FinnStutzenstein/SecureMedifiles
...
Secure Mediafiles and check view permissions
2017-09-14 20:31:33 +02:00
FinnStutzenstein
288a706d01
Rework on motion comments ( fixes #3350 ).
2017-09-12 14:58:43 +02:00
FinnStutzenstein
8adf2a6729
Clear the identifier_number on identifier reset ( fixes #3353 )
2017-09-08 22:09:25 +02:00
Emanuel Schütze
3a25e87330
Merge pull request #3366 from FinnStutzenstein/Issue3363
...
New permission for managing lists of speakers (fixes #3363 )
2017-09-08 22:05:32 +02:00
Emanuel Schütze
62f0f23228
Merge pull request #3393 from FinnStutzenstein/Issue3389
...
Pagination for assingment list (fixes #3389 )
2017-09-08 21:57:25 +02:00
FinnStutzenstein
4472734d09
New permission for managing lists of speakers ( fixes #3363 )
2017-09-08 21:55:42 +02:00
FinnStutzenstein
dc03a67281
Pagination for assingment list ( fixes #3389 )
2017-09-08 21:45:37 +02:00
Emanuel Schütze
29f60fc6aa
Fixed motion detail style issues
...
- margin in motion diff view
- personal note box
2017-09-08 18:25:48 +02:00
Emanuel Schütze
1e1e7637f9
Merge pull request #3379 from FinnStutzenstein/AgentaTitle
...
New layout for agenda list slide, fixing long titles in agenda list v…
2017-09-08 15:16:52 +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
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
