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
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
Norman Jäckel
688b247bcc
Added flag to use Geiss. Small changes for the new getgeiss command. Changed path of collected statics.
2017-03-06 14:39:55 +01:00
Oskar Hahn
e3cc592f70
Added the command getgeiss. Work on start script to use Geiss.
2017-03-06 14:39:26 +01:00
Norman Jäckel
8b710b0b13
Merge pull request #3056 from emanuelschuetze/cleanup
...
Removed unused ubuntu fonts (from old pdf generation).
2017-03-05 23:54:09 +01:00
Norman Jäckel
0c5746b349
Merge pull request #3055 from emanuelschuetze/fix
...
Fixed iframeoverlay and missing ErrorMessage.
2017-03-05 22:43:10 +01:00
Emanuel Schütze
1d6326fb1b
Removed unused ubuntu fonts (from old pdf generation).
2017-03-05 22:40:38 +01:00
Emanuel Schütze
d92328674a
Fixed iframeoverlay and missing ErrorMessage.
2017-03-05 22:27:14 +01:00
Emanuel Schütze
2d65ecbc3a
Updated all translations.
...
Added Russia as new language.
2017-03-05 22:25:48 +01:00
Emanuel Schütze
c6ced4e4a0
Merge pull request #3051 from emanuelschuetze/issues-2142
...
Excluded already elected persons for new ballot (Fixed #2142 )
2017-03-05 21:30:35 +01:00
Emanuel Schütze
ff840ab3c6
Excluded already elected persons for new ballot ( Fixed #2142 )
...
- Reorder assignment ballot tabs in detail template.
- Removed logic to set phase automatically to 'finished' if
elected candidates reached, because autoupdate makes it unreliable.
2017-03-05 21:25:22 +01:00
Norman Jäckel
4c2b13a142
Merge pull request #3052 from emanuelschuetze/mobile-theme
...
Responsive design improvements
2017-03-05 20:34:50 +01:00
Norman Jäckel
32aaa28637
Merge pull request #3050 from CatoTH/bugfix-inline-diff-when-replacing-paragraphs
...
Improve the diff when a paragraph is replaced by another one
2017-03-05 20:25:43 +01:00
Norman Jäckel
6525b79774
Merge pull request #3047 from emanuelschuetze/projector-control
...
Inscreased projector scroll distance.
2017-03-05 20:23:56 +01:00
Norman Jäckel
0ca8fa57ed
Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers
...
Bugfix for missing line numbers in diff view in the projector
2017-03-05 20:23:35 +01:00
Norman Jäckel
16743cd9b8
Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix
...
Handle STRIKE-tags correctly in line numbering - fixes #3027
2017-03-05 20:22:59 +01:00
Norman Jäckel
659c7858eb
Merge pull request #3043 from emanuelschuetze/category-sort-template
...
Added motion detail links to category sort view.
2017-03-05 20:22:40 +01:00
Norman Jäckel
1fdb3a4f2a
Merge pull request #3042 from emanuelschuetze/3028
...
Improved go to line number tooltip/popup. (#3028 )
2017-03-05 20:20:25 +01:00
Norman Jäckel
a33d504c6b
Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements
...
Bugfix for #3024 - escaping HTML tags
2017-03-05 20:19:24 +01:00
Emanuel Schütze
f67afd1823
Responsive design improvements
...
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
controls as dropdown (for small/extra small devices) or as
button group (for medium/large devices).
2017-03-05 00:30:00 +01:00
Tobias Hößl
6577287e26
Improve the diff when a paragraph is replaced by another one
2017-03-04 20:48:18 +01:00
Emanuel Schütze
65d93d1b66
Inscreased projector scroll distance.
...
Allows faster scrolling for long slides.
2017-03-04 16:52:27 +01:00
Tobias Hößl
0022df2aff
Bugfix for missing line numbers in diff view in the projector
2017-03-04 16:42:02 +01:00
Tobias Hößl
c8006588c5
Handle STRIKE-tags correctly in line numbering
2017-03-04 16:17:48 +01:00
Emanuel Schütze
fa395d6cc2
Added motion detail links to category sort view.
2017-03-04 16:07:05 +01:00
Emanuel Schütze
a9144b6d5b
Improved go to line number tooltip/popup. ( #3028 )
2017-03-04 16:00:54 +01:00
Tobias Hößl
e698d81f9f
Bugfix for #3024 - escaping HTML tags
2017-03-04 15:51:33 +01:00
Emanuel Schütze
3903be5d6b
Fixed switching between motion versions ( Fixed #2363 )
...
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
active when user change version)
2017-03-03 17:03:32 +01:00
Emanuel Schütze
95c19159f8
Merge pull request #3026 from CatoTH/bugfix-line-numbering-diff
...
Several bug fixes in the diff
2017-03-03 15:26:44 +01:00
Tobias Hößl
74f40395d9
Several bug fixes in the diff
2017-03-03 15:16:51 +01:00
Norman Jäckel
cc6d2a6ca9
Merge pull request #3035 from FinnStutzenstein/Issue3003
...
Always provide the list of speakers (closes #3003 )
2017-03-03 14:53:55 +01:00
Emanuel Schütze
91cb124918
Merge pull request #3018 from FinnStutzenstein/ErrorMessages
...
Error messages and global messaging service (closes #2949 )
2017-03-03 14:52:00 +01:00
FinnStutzenstein
9c89f4d59c
Error messages and global messaging service ( fixes #2949 , fixes #1774 )
2017-03-03 14:36:31 +01:00
FinnStutzenstein
9fbbfe0f50
Always provide the list of speakers ( closes #3003 )
2017-03-03 14:35:55 +01:00
Norman Jäckel
4744e1ca99
Merge pull request #3034 from FinnStutzenstein/TemplateFixes
...
Small template improvements
2017-03-03 14:23:05 +01:00
FinnStutzenstein
606c17ef43
Small template improvements
2017-03-03 11:53:33 +01:00
Norman Jäckel
5a821ecf49
Fixed use of PATCH and PUT. Fixed #1871 .
2017-02-27 17:20:57 +01:00
Norman Jäckel
96cbf17e72
Merge pull request #3015 from emanuelschuetze/fix-topic-form
...
Fixed forms (added missing operator).
2017-02-27 15:18:49 +01:00
Emanuel Schütze
65fcd8e9d6
Fixed forms (added missing operator).
...
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
2017-02-27 10:02:43 +01:00
Emanuel Schütze
7630553303
Workaround to prevent screen jumps in assignment detail ( Fixed #2555 ).
...
Fixed also unexpected ballot creation while uib-tab updates.
Now button instead of tab is used for creating new ballot.
2017-02-24 22:33:23 +01:00
Emanuel Schütze
e063ab8fe8
Updated EN and DE translations files.
2017-02-24 16:20:42 +01:00
Emanuel Schütze
2215d7159a
Merge pull request #3001 from emanuelschuetze/user-profile
...
Reduced user profile form
2017-02-24 16:04:39 +01:00
Emanuel Schütze
04223b0107
Merge pull request #3009 from FinnStutzenstein/ClosManagement
...
Manageview for Current list of speakers(closes #3007 )
2017-02-24 16:03:01 +01:00
FinnStutzenstein
c093796a17
Manage view for Current list of speakers ( closes #3007 )
2017-02-24 15:48:08 +01:00
Emanuel Schütze
6b74bf635d
Merge pull request #2993 from emanuelschuetze/motion-poll-log
...
Added motion log entry for creating polls.
2017-02-24 15:44:53 +01:00
Emanuel Schütze
e67d67a07f
Merge pull request #3006 from FinnStutzenstein/Issue2894
...
hide 'show as agenda item' for non authorized users (fixes #2894 )
2017-02-24 15:44:25 +01:00
Emanuel Schütze
045c65de49
Merge pull request #3008 from FinnStutzenstein/Issue2636
...
Remove scrolling to a line on projector (closes #2636 )
2017-02-24 15:38:18 +01:00
Emanuel Schütze
5d38ca8c68
Merge pull request #3005 from FinnStutzenstein/Issue3004
...
Fixing create view for amendments (fixing #3004 )
2017-02-24 15:37:46 +01:00
Emanuel Schütze
4ebc238ea2
Added motion log entry for creating polls.
...
Use timezone support for motion log time.
2017-02-24 15:31:26 +01:00
Norman Jäckel
5b4ca84306
Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984 .
2017-02-24 15:22:55 +01:00
FinnStutzenstein
8a8755f22d
Fixing create view for amendments (fixing #3004 )
2017-02-24 15:16:12 +01:00
FinnStutzenstein
803f9dba96
Remove scrolling to a line on projector ( closes #2636 )
2017-02-24 10:31:48 +01:00
FinnStutzenstein
1c1a2bef09
hide 'show as agenda item' for non authorized users ( fixes #2894 )
2017-02-24 10:15:28 +01:00
Emanuel Schütze
7de2f5c79c
Reduced user profile form
2017-02-22 23:31:50 +01:00
Emanuel Schütze
bf0b5d5062
Added 'reject all change recommendations' button.
2017-02-22 23:08:46 +01:00
Emanuel Schütze
4168153ba3
Added extension for state and recommendation names in dropdown.
2017-02-22 21:31:47 +01:00
Emanuel Schütze
7f08a09497
Merge pull request #2992 from FinnStutzenstein/CleanUp
...
Collection name to CamelCase (fixes #2983 )
2017-02-22 19:44:49 +01:00
FinnStutzenstein
5374b2f398
Collection name to CamelCase ( fixes #2983 )
2017-02-22 19:12:38 +01:00
Emanuel Schütze
60ebac9f8b
Merge pull request #2994 from FinnStutzenstein/Improvements
...
Usability improvements
2017-02-22 19:03:42 +01:00
FinnStutzenstein
da89bf5a83
Usability improvements
2017-02-22 16:58:52 +01:00
Emanuel Schütze
8ff247b555
Allowed to export/import initial user password.
2017-02-22 08:38:14 +01:00
Emanuel Schütze
e1075eb24d
Minor fixes from previous pull request reviews.
2017-02-21 15:56:41 +01:00
Norman Jäckel
4d3a45c8fb
Merge pull request #2991 from emanuelschuetze/css-fixes
...
CSS improvements for projector sidebar on small devices.
2017-02-20 20:39:22 +01:00
Norman Jäckel
ebf9278b79
Merge pull request #2990 from emanuelschuetze/fixProjection
...
Fix motion projection.
2017-02-20 20:38:59 +01:00
Emanuel Schütze
acf996a720
CSS improvements for projector sidebar on small devices.
2017-02-20 19:46:44 +01:00
Emanuel Schütze
d79cea9a8b
Fix motion projection.
2017-02-20 18:44:37 +01:00
Norman Jäckel
1e9c7273ae
Merge pull request #2987 from emanuelschuetze/issue2963
...
Fixed placement of 'back' button in motion block view (Fixed #2963 ).
2017-02-18 00:06:00 +01:00
Emanuel Schütze
a06d969dc3
Updated translation resources and German translations.
2017-02-17 23:21:54 +01:00
Emanuel Schütze
58f499283f
Fixed translation strings.
2017-02-17 23:21:50 +01:00
Emanuel Schütze
e4bd44082d
Fixed placement of 'back' button in motion block view ( Fixed #2963 ).
2017-02-17 22:32:17 +01:00
Emanuel Schütze
6bad8e8cc6
Merge pull request #2973 from FinnStutzenstein/Dialogs
...
Dialogs for some views
2017-02-17 22:20:59 +01:00
Norman Jäckel
e35e65b7d4
Merge pull request #2985 from normanjaeckel/AgendaSortCheck
...
Added check for hierarchical loops in agenda sort view. See #2972 .
2017-02-17 22:08:23 +01:00
Emanuel Schütze
9ae1d7e59a
Show allert in sort template if agenda sort request failed.
2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019
Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector
...
Send also motion.state.workflow to motion block slide.
2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819
Send also motion.state.workflow to motion block slide.
...
to show recommendation names in slide template
2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3
Added check for hierarchical loops in agenda sort view. See #2972 .
2017-02-17 17:20:30 +01:00
Norman Jäckel
56420aa0f5
Merge pull request #2982 from emanuelschuetze/recommendation-config
...
Added new config for default change recommendation view.
2017-02-17 16:33:36 +01:00
Norman Jäckel
935a2a7245
Merge pull request #2980 from emanuelschuetze/pdf-worker-fix
...
Fixed placeholder replacement in pdf worker.
2017-02-17 16:29:09 +01:00
Norman Jäckel
ee66ee3d72
Merge pull request #2979 from FinnStutzenstein/Issue2951
...
fixing #2951
2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f
Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate
...
Fixing MotionBlock autoupdate and added projector button (fixes #2958 )
2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a
Added new config for default change recommendation view.
...
Use this default view for motion catalog pdf and motion detail view.
2017-02-17 16:03:00 +01:00
Emanuel Schütze
a804362e16
Fixed placeholder replacement in pdf worker.
...
Make it more dynamic by searching recursively.
2017-02-17 15:11:28 +01:00
FinnStutzenstein
735dbcf109
Better dialog handling. Many fixes.
2017-02-17 14:58:35 +01:00
FinnStutzenstein
a5398a491c
fixing #2951
2017-02-17 14:54:32 +01:00
Emanuel Schütze
9a1e45682c
Merge pull request #2976 from FinnStutzenstein/templateFixes
...
Update mediafile form
2017-02-17 13:58:49 +01:00
FinnStutzenstein
0e401e7223
Fixing MotionBlock autoupdate and added projector button ( fixes #2958 )
2017-02-17 13:49:55 +01:00
Emanuel Schütze
0075c23225
Merge pull request #2977 from emanuelschuetze/issue2967
...
Fixed margin-top of motion change recommendation line tooltip.
2017-02-17 13:21:54 +01:00
Emanuel Schütze
09ae3c3425
Fixed margin-top of motion change recommendation tooltip ( Fixed #2967 ).
2017-02-17 13:17:24 +01:00
Norman Jäckel
28a5c9ecaf
Merge pull request #2974 from emanuelschuetze/pdf-layout
...
Motion PDF improvements
2017-02-17 13:11:15 +01:00
FinnStutzenstein
a765f5cb0e
Update mediafile form
2017-02-17 12:43:50 +01:00
Emanuel Schütze
75949cb01c
Fixed IntegrityError while creating groups with postgres ( Fixed #2960 ).
...
Use ng-submit for group form template.
2017-02-17 12:06:07 +01:00
Emanuel Schütze
46f6bbb907
Motion PDF improvements
...
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.
Added missing translation string.
2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff
Merge pull request #2891 from normanjaeckel/CamelCase
...
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 21:09:13 +01:00
Emanuel Schütze
d595e28d09
Merge pull request #2969 from CatoTH/Issue2961-bugfix
...
Solving two bugs in the diff - for #2961
2017-02-16 14:59:51 +01:00
Norman Jäckel
89192236fc
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 13:31:57 +01:00
Emanuel Schütze
0da7765dc0
Merge pull request #2968 from normanjaeckel/StaticDir
...
Fixed write settings command for Windows portable version. Fixed #2947 .
2017-02-15 22:57:05 +01:00
Emanuel Schütze
7a73b30189
More layout fixes for motion diff view slide.
...
- Fixed wrong text order.
- Improved change summary box.
2017-02-15 22:40:18 +01:00
Tobias Hößl
8029492d91
Bugfix: layout of diff view on the projector
2017-02-15 21:36:30 +01:00
Tobias Hößl
afff1f35f8
Solving two bugs in the diff
2017-02-15 20:23:29 +01:00
Emanuel Schütze
be342f752f
Merge pull request #2966 from emanuelschuetze/issue2956
...
Send only data to client which user is allowed to see (Fixed #2956 ).
2017-02-15 20:18:45 +01:00
Emanuel Schütze
ae6496852e
Merge pull request #2959 from emanuelschuetze/issue2954
...
Added missing topic text to agenda csv export (Fixed #2954 ).
2017-02-15 20:18:01 +01:00
Norman Jäckel
1a53c7c3cc
Fixed write settings command for Windows portable version. Fixed #2947 .
2017-02-15 17:07:59 +01:00
Emanuel Schütze
3e92799838
Send only data to client which user is allowed to see ( Fixed #2956 ).
...
Fixed get_restricted_data functions for motion and mediafiles.
2017-02-15 16:51:44 +01:00
Emanuel Schütze
aa0791fc34
Added missing topic text to agenda csv export ( Fixed #2954 ).
2017-02-15 14:46:25 +01:00
Sean Engelhardt
4eefde839b
pdf w.o linen numbers and change rec. ( fixes #2962 )
2017-02-15 14:23:28 +01:00
Oskar Hahn
26b7f2879c
Let CollectionElement fail early
...
Fixes #2835
Fixes #2904
2017-02-12 14:15:58 +01:00
Emanuel Schütze
1c79e2c8ee
Update version to 2.1b4-dev
2017-02-10 23:40:18 +01:00
Emanuel Schütze
2aae6d43eb
Release 2.1b3
2017-02-10 23:39:52 +01:00
Emanuel Schütze
75fa1fdb7b
Merge pull request #2945 from emanuelschuetze/assignment-projector-fix
...
Fixed outdated assignment phases variable in projetor.js.
2017-02-10 23:36:15 +01:00
Emanuel Schütze
67b5b4ca32
Updated German translations.
2017-02-10 23:28:38 +01:00
Emanuel Schütze
41b30d70b6
Fixed outdated assignment phases variable in projetor.js.
...
Removed wrong translation string.
2017-02-10 23:26:38 +01:00
Emanuel Schütze
1230f4a29a
New full text search on client-side ( Fixed #2865 ).
...
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
Emanuel Schütze
311b134d81
Merge pull request #2939 from FinnStutzenstein/Encoding
...
Added UTF-8 byte order mark for csv export
2017-02-10 21:23:09 +01:00
FinnStutzenstein
30a3382bd1
Added UTF-8 byte order mark for csv export and global csv separator config
2017-02-10 20:47:57 +01:00
Norman Jäckel
97de8cf785
Merge pull request #2942 from FinnStutzenstein/Issue2864
...
check if startup promise is resolved
2017-02-10 14:25:19 +01:00
FinnStutzenstein
8f613177cb
check if startup promise is resolved
2017-02-10 10:23:46 +01:00
FinnStutzenstein
b73c50a4f9
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 09:11:45 +01:00
Norman Jäckel
160333beea
Merge pull request #2931 from FinnStutzenstein/Issue2669
...
Reorganize the current list of speakers. Fixes #2669 and find()-calls
2017-02-09 20:06:43 +01:00
FinnStutzenstein
3c36cd5757
Reorganize the current list of speakers. Fixes #2669 and find()-calls.
2017-02-07 12:24:54 +01:00
Emanuel Schütze
eb0d34d212
Merge pull request #2937 from FinnStutzenstein/Issue2560
...
Inline edit the ballot description (closes #2560 )
2017-02-07 12:00:56 +01:00
FinnStutzenstein
38279f4895
Inline edit the ballot description ( closes #2560 )
2017-02-07 11:53:09 +01:00
Emanuel Schütze
b4eff0ea1a
Updated German translations.
2017-02-07 09:16:12 +01:00
Emanuel Schütze
f66e551eaa
Merge pull request #2936 from FinnStutzenstein/MotionReason
...
Set resaon on save with CKEditor (fixes #2934 )
2017-02-06 17:29:09 +01:00
FinnStutzenstein
bacadd6931
Set resaon on save with CKEditor ( fixes #2934 )
2017-02-06 14:50:51 +01:00
Emanuel Schütze
12b50a0d68
Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle
...
PDF Layout improvements
2017-02-06 14:44:06 +01:00
Norman Jäckel
2e410599bb
Merge pull request #2932 from emanuelschuetze/fix-category-numbering
...
Fixed motion numbering in category sort view.
2017-02-06 14:29:19 +01:00
Emanuel Schütze
80b9ce138f
PDF Layout improvements
...
- Added parent motion into subtitle of motion pdf.
(for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
2017-02-06 14:22:13 +01:00
Emanuel Schütze
f238125a23
Fixed motion numbering in category sort view.
...
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
2017-02-06 12:11:50 +01:00
Emanuel Schütze
341916123c
Fix word-wrap for long motion identifier in Firefox.
2017-02-03 14:02:36 +01:00
Emanuel Schütze
3ca254c88e
Show/hide internal items in agenda sort view.
2017-02-03 12:50:57 +01:00
Emanuel Schütze
e7ee8fbc07
Fixed some minor template styles.
...
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
2017-02-03 12:50:57 +01:00
Emanuel Schütze
bbd8782c4c
Fix 'follow recommendation for all motions' function.
...
in motion block detail view
2017-02-03 12:50:52 +01:00
Norman Jäckel
6f05fc09ce
Merge pull request #2929 from FinnStutzenstein/Issue2927
...
Fixing merge conflicts (fixes #2927 )
2017-02-03 11:54:21 +01:00
Norman Jäckel
aade91cead
Merge pull request #2926 from emanuelschuetze/issue-2923
...
Fixed dynamic pdf header and footer for worker (Fixed #2923 ).
2017-02-03 11:53:34 +01:00
Emanuel Schütze
3d60238ce1
Fixed dynamic pdf header/footer and table border ( Fixed #2923 ).
...
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
2017-02-03 11:33:46 +01:00
FinnStutzenstein
4bc9a26c4c
Fixing merge conflicts ( fixes #2927 )
2017-02-03 08:40:48 +01:00
Norman Jäckel
8c53b53a9d
Added server side sort view for agenda items. See #2452 .
2017-02-01 14:23:59 +01:00
Emanuel Schütze
bcff33330c
Merge pull request #2922 from normanjaeckel/Console
...
Removed console.log call.
2017-02-01 13:36:00 +01:00
Norman Jäckel
9ff9ac92be
Removed console.log call.
2017-02-01 12:55:26 +01:00
Norman Jäckel
b6db7d481b
Merge pull request #2895 from FinnStutzenstein/Issue2885
...
Possibility to send extra startup data (closes #2885 )
2017-02-01 11:45:21 +01:00
FinnStutzenstein
aed18205c4
showing config save status ( closes #2842 )
2017-01-31 18:54:02 +01:00
FinnStutzenstein
49e32d8e57
Possibility to send extra startup data ( closes #2885 )
2017-01-31 13:17:42 +01:00
Emanuel Schütze
c8cd1a7210
Merge pull request #2917 from FinnStutzenstein/Worker
...
Use workers for pdf generation
2017-01-31 12:02:43 +01:00
FinnStutzenstein
e1b4c1fc68
Used worker for pdf generation.
...
Moved pdfmake.createPdf() into a web worker thread to prevent
blocking UI and max_script_runtime error in browser.
Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).
2017-01-30 23:03:29 +01:00
Emanuel Schütze
f5fab05388
Merge pull request #2920 from emanuelschuetze/fixAssignmentVoteOrder
...
Fixed wrong order of assignment votes caused by redis cache.
2017-01-30 22:57:45 +01:00
Emanuel Schütze
83e16b0b09
Fixed wrong order of assignment votes caused by redis cache.
2017-01-30 21:33:41 +01:00
Emanuel Schütze
39037af662
Merge pull request #2896 from FinnStutzenstein/Issue2871
...
Prevent XSS-attacks (fixes #2871 )
2017-01-30 21:11:46 +01:00
FinnStutzenstein
d55d374211
Prevent XSS-attacks ( fixes #2871 )
2017-01-30 21:04:41 +01:00
Oskar Hahn
6b5c329605
Fix the migration of the groups.
...
Fixes #2915
2017-01-27 11:59:31 +01:00
Emanuel Schütze
1d969838f2
Update version to 2.1b3-dev
2017-01-26 21:47:11 +01:00
Emanuel Schütze
e2fb1a60a1
Release 2.1b2
2017-01-26 21:46:21 +01:00
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
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
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
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
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
FinnStutzenstein
9247009f1c
Csv export for IE ( closes #2898 )
2017-01-23 16:24:25 +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
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
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
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
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
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
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
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
Norman Jäckel
3600dd58f0
Merge pull request #2858 from emanuelschuetze/issue2142
...
Assignment list: Used number of candidates, removed number of needed …
2017-01-14 15:11:21 +01:00
Emanuel Schütze
527f949968
Assignment list: Used number of candidates, removed number of needed candidates ( Fixes #2142 )
2017-01-14 12:55:51 +01:00
Emanuel Schütze
d76162e3b0
Increased the cache option MAX_ENTRIES from 1000 to 10000 ( Fixes #2828 ).
2017-01-14 12:46:23 +01:00
FinnStutzenstein
794db79511
adding permission checks
2017-01-14 12:13:38 +01:00
Emanuel Schütze
458a7cf7c4
Merge pull request #2846 from normanjaeckel/MotionBlockSecu
...
Fixed motion create view. Fixed #2506 .
2017-01-14 12:10:51 +01:00
Emanuel Schütze
8c4b38f018
Merge pull request #2847 from FinnStutzenstein/Issue2844
...
Group order and hide internal items filter
2017-01-14 11:39:51 +01:00
Emanuel Schütze
8c9bde27fb
Merge pull request #2853 from normanjaeckel/ManagePy
...
Added error message for unknown args. Fixed #2200 .
2017-01-14 11:39:17 +01:00
Norman Jäckel
a918361ec5
Fixed motion create view. Fixed #2506 .
2017-01-14 11:38:20 +01:00
FinnStutzenstein
f092d6670d
Group order, hide internal items filter, hide comment in agenda list view
2017-01-14 10:51:07 +01:00
Norman Jäckel
aa47ecbf8a
Added error message for unknown args. Fixed #2200 .
2017-01-14 10:48:41 +01:00
Emanuel Schütze
99a771ac6c
Merge pull request #2845 from FinnStutzenstein/Issue2833
...
Fixing user list view with restricted permissions (closes #2833 )
2017-01-14 10:47:12 +01:00
Norman Jäckel
663feff806
Merge pull request #2848 from emanuelschuetze/issue2421
...
Added text to empty assignment poll result slide (Fixed #2421 )
2017-01-14 10:41:24 +01:00
Emanuel Schütze
35a5d4fe3b
Merge pull request #2839 from FinnStutzenstein/Issue2838
...
Fixing #2838
2017-01-14 10:40:57 +01:00
Emanuel Schütze
113aac59b3
Added text to empty assignment poll result slide ( Fixed #2421 )
2017-01-14 10:21:19 +01:00
FinnStutzenstein
76e6bac422
Fixing #2838
2017-01-14 10:21:14 +01:00
FinnStutzenstein
c0f092d811
Fixing user list view with restricted permissions ( closes #2833 )
2017-01-14 09:57:45 +01:00
Norman Jäckel
d22dff2743
Merge pull request #2841 from flanagan/remove-summary
...
Removed recommendation motion summary on slide.
2017-01-13 21:32:50 +01:00
Meinert Leinigen
d133199a73
Removed Recommendation motion summary
2017-01-13 21:28:03 +01:00
Oskar Hahn
1dc671430a
Fix channels
2017-01-13 20:53:06 +01:00
Oskar Hahn
728576d514
Performance improvements
...
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
2017-01-13 13:37:18 +01:00
FinnStutzenstein
b44b58393d
Motion comments inline editing
2017-01-11 20:59:50 +01:00
Emanuel Schütze
a6807d77bf
Added groups_id to management command 'createopenslidesuser'.
2017-01-11 13:46:56 +01:00
Emanuel Schütze
962c06c85f
Merge pull request #2820 from FinnStutzenstein/Issue2667
...
Change user import table
2017-01-10 21:22:39 +01:00
Norman Jäckel
8e385199d5
Merge pull request #2826 from FinnStutzenstein/Issue2805
...
Do not enable inline editing for non privileged users
2017-01-10 21:13:52 +01:00
Oskar Hahn
97b21427aa
Change the way that missing cache ids are found.
...
This is probalby faster but in any way it maks debugging a lot easier. To go though
a big list in a for-loop is no fun at all.
2017-01-10 20:50:44 +01:00
FinnStutzenstein
cf7033e033
Do not enable inline editing for non privileged users
2017-01-09 16:03:09 +01:00
Emanuel Schütze
17b951058b
Merge pull request #2821 from emanuelschuetze/no-amendments
...
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
2017-01-09 14:33:57 +01:00
Emanuel Schütze
41124a53ca
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
...
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
2017-01-09 14:25:28 +01:00
FinnStutzenstein
a9fbbb522e
Change user import table
2017-01-09 14:22:32 +01:00
Norman Jäckel
58d8f68cc5
Merge pull request #2814 from FinnStutzenstein/ConfigEditor
...
Use ckeditor in config
2017-01-09 14:19:32 +01:00
Emanuel Schütze
6502f36a90
Merge pull request #2796 from FinnStutzenstein/Issue2548
...
Project change recommendations
2017-01-09 09:27:46 +01:00
Norman Jäckel
1a88f0985a
Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks
...
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
2017-01-08 13:43:20 +01:00
FinnStutzenstein
e8fa488d60
Project change recommendations
2017-01-07 14:48:11 +01:00
FinnStutzenstein
4530a5faed
Use ckeditor in config
2017-01-07 14:45:58 +01:00
Emanuel Schütze
f4d468a6f6
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
...
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
2017-01-06 21:38:08 +01:00
Emanuel Schütze
11c0b0cc3f
Merge pull request #2816 from FinnStutzenstein/Issue2127
...
Use ckeditor to edit projector messages
2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b
Do not project more than one message
2017-01-06 19:48:37 +01:00
FinnStutzenstein
6e7321d2a3
disable edit button if it is not possible to edit
2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3
Use ckeditor to edit projector messages
2017-01-06 12:45:30 +01:00
Maximilian Krambach
a31ffd1009
print correct number of ballots ( closes #2504 )
2017-01-06 11:39:55 +01:00
Emanuel Schütze
cc0c0bf0d4
Merge pull request #2783 from FinnStutzenstein/PapaParse
...
New csv import using PapaParse
2017-01-06 11:33:06 +01:00
Norman Jäckel
c12d985ab6
Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf
...
Add QR code in user access list pdf (fixes #2665 )
2017-01-06 11:08:22 +01:00
FinnStutzenstein
f5fa3575df
New csv import using PapaParse
2017-01-06 10:50:03 +01:00
Emanuel Schütze
388e6353cc
Show qr codes in access data pdf only if config fields are set.
...
Disable footer with page numbers.
2017-01-04 22:43:17 +01:00
Sean Engelhardt
9abf9d5d57
Add QR codes to access data list ( fixes #2665 )
2017-01-04 15:50:20 +01:00
Maximilian Krambach
912dc1af8f
Bind mediafile to projector scope ( fixes #2706 )
2016-12-29 11:37:56 +01:00
Norman Jäckel
900ddaabb3
Merge pull request #2803 from emanuelschuetze/participant-number2
...
Added "No." for participant number in get_full_name().
2016-12-21 12:33:12 +01:00
Emanuel Schütze
c79e779934
Added "No." for participant number in get_full_name().
2016-12-21 12:08:37 +01:00
Norman Jäckel
7b0dca84d2
Merge pull request #2801 from FinnStutzenstein/Issue2754
...
More select mode options for users
2016-12-21 11:57:20 +01:00
Norman Jäckel
286643ddd2
Merge pull request #2797 from FinnStutzenstein/Issue2653
...
projector language (closes #2653 )
2016-12-21 11:55:49 +01:00
Norman Jäckel
bfa0b4b3fe
Merge pull request #2800 from FinnStutzenstein/Issue2748
...
Consistent time handling and generic time converter code
2016-12-21 11:52:47 +01:00
FinnStutzenstein
365c122edd
More select mode options for users
2016-12-21 10:42:34 +01:00
FinnStutzenstein
f9f64b3e31
projector language ( closes #2653 )
2016-12-21 10:41:06 +01:00
FinnStutzenstein
6454853bf6
Consistent time handling and generic time converter code
2016-12-21 10:09:27 +01:00
Emanuel Schütze
be66a26353
Move participant number to the end of get_full_name().
2016-12-21 08:59:50 +01:00
Emanuel Schütze
16ff9200a9
Merge pull request #2782 from FinnStutzenstein/AssignmentSort
...
Sort candidates in assignments
2016-12-19 19:47:38 +01:00
Emanuel Schütze
ff444eaa5d
Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
...
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
Tobias Hößl
159720b983
Bugfix for PDF-export - fixes #2777
2016-12-19 16:17:36 +01:00
FinnStutzenstein
3b1ab265eb
Sort candidates in assignments
2016-12-19 16:03:45 +01:00
FinnStutzenstein
a24b4aed99
cookie handling on login
2016-12-19 14:14:46 +01:00
Norman Jäckel
655a1b8f71
Update version to 2.1b2-dev
2016-12-16 23:54:23 +01:00
Norman Jäckel
789a3c308b
Release 2.1b1
2016-12-16 23:54:23 +01:00
Emanuel Schütze
01ab52a637
Use Roboto Medium font for some more 'bold' classes.
2016-12-16 22:10:56 +01:00
Emanuel Schütze
82396a784d
Fixing some remarks for CKEditor PR#2770
2016-12-16 21:43:19 +01:00
Tobias Hößl
08cb6a3d1b
Bugfix for line numbering with CKeditor
2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249
Going back from TinyMCE to CKEditor
...
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
2016-12-16 21:43:19 +01:00
Norman Jäckel
4ebb8023e3
Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
...
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze
abe6c0f589
Merge pull request #2786 from normanjaeckel/PatchInMediafile
...
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 19:15:25 +01:00
Emanuel Schütze
cd89f72a17
Merge pull request #2778 from emanuelschuetze/inject-improvement
...
Speed up autoupdates
2016-12-16 19:12:45 +01:00
Emanuel Schütze
4b9be816b3
Speed up autoupdates
...
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
2016-12-16 18:55:24 +01:00
Norman Jäckel
75f4c55181
Removed viewpoint for Django url patterns. Fixed #1453 .
2016-12-16 17:01:34 +01:00
Norman Jäckel
11e39e4ed8
Changed PATCH to PUT for mediafile update. See #1871 .
2016-12-16 16:58:31 +01:00
Tobias Hößl
46cf26481e
Bugfix for #2770
2016-12-14 22:28:44 +01:00
Norman Jäckel
1221ef4f02
Rearrange client mediafile app.
2016-12-14 17:16:42 +01:00
Norman Jäckel
deb5c5f4b3
Merge pull request #2774 from matakuka/language
...
Change the language selector to the languages' own names
2016-12-14 16:38:24 +01:00
Maximilian Krambach
0e6324b252
Change the language selector to the languages' own names
2016-12-14 15:25:38 +01:00
Sean Engelhardt
41ceb4ef9d
add special voting values for missed options ( fixes #2709 )
2016-12-14 14:05:03 +01:00
Norman Jäckel
cebfbf5b8d
Merge pull request #2633 from normanjaeckel/SquishMigrations
...
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +01:00
Emanuel Schütze
218b4bc7f4
Remove old countdowns and messages in core migrations.
2016-12-13 17:04:25 +01:00
Emanuel Schütze
78361308aa
Updated EN+DE translations.
2016-12-13 12:20:14 +01:00
Norman Jäckel
3096958ba9
Prepare migrations for 2.1b1.
...
Agenda, Assignments, Core, Mediafiles, Motions, Users.
Topics are already done.
2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b
Merge pull request #2764 from FinnStutzenstein/Issue2754
...
More motion select mode options and layout changes for guests
2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c
More motion select mode options and layout changes for guests
2016-12-13 11:27:44 +01:00
Norman Jäckel
6a58174e25
Merge pull request #2765 from FinnStutzenstein/Issue2451
...
rename mediafiles private flag to hidden
2016-12-13 11:15:53 +01:00
Emanuel Schütze
a9cc8fcb37
Some template style and translation fixes.
2016-12-12 20:30:50 +01:00
FinnStutzenstein
6bbbf30d94
rename mediafiles private flag to hidden
2016-12-12 16:23:31 +01:00
Norman Jäckel
99db9b71b7
Merge pull request #2760 from normanjaeckel/MotionTextIntro
...
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce
Template fixes for motion preamble ( #2760 ).
2016-12-12 16:14:32 +01:00
Emanuel Schütze
2bf1b3d827
Merge pull request #2755 from normanjaeckel/StatePermission
...
Fixed state flag required permission to see.
2016-12-12 13:49:07 +01:00
Emanuel Schütze
8780c47fc1
Minor fixes ( Fixes #2750 )
...
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750 ).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Norman Jäckel
7772f60bd4
Added global config for motion preamble.
2016-12-12 12:51:27 +01:00
Norman Jäckel
6dc598800d
Fixed state flag required permission to see.
2016-12-11 22:02:16 +01:00
Emanuel Schütze
116c3702f2
Updated German translations.
...
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze
cd08f02949
Updated EN translation file.
2016-12-10 11:14:08 +01:00
Emanuel Schütze
43cdfd3836
Merge pull request #2752 from FinnStutzenstein/MotionState
...
Adding 'done' option in motion state filter
2016-12-09 22:36:32 +01:00
Emanuel Schütze
8289306569
Merge pull request #2746 from emanuelschuetze/fonts
...
Use Roboto font in all templates.
2016-12-09 22:26:38 +01:00
Emanuel Schütze
0bef3d751e
Merge pull request #2742 from emanuelschuetze/missing-translations
...
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +01:00
FinnStutzenstein
efaa00483c
Adding 'done' option in motion state filter
2016-12-09 15:18:35 +01:00
Norman Jäckel
c2edf134e2
Merge pull request #2751 from FinnStutzenstein/Issue2747
...
Some stylistic changes and new motion filter option
2016-12-09 15:16:50 +01:00
Emanuel Schütze
358fd59d3c
Merge pull request #2749 from FinnStutzenstein/Issue2666
...
changing user import (closes #2666 )
2016-12-09 15:14:42 +01:00
Emanuel Schütze
f6d01c1d17
Mark missing translation strings in table headers.
2016-12-09 15:13:35 +01:00
Emanuel Schütze
fb7b265826
Use Roboto font in all templates.
...
- Only install needed font files for Roboto and Roboto Condensed
which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
in app.css and projector.css.
- Remove Open Sans font.
2016-12-09 15:10:31 +01:00
FinnStutzenstein
acba95f8a4
changing user import ( closes #2666 )
2016-12-09 15:02:32 +01:00
FinnStutzenstein
f7fcb69cc2
Some stylistic changes and new motion filter option
2016-12-09 14:58:15 +01:00
FinnStutzenstein
36c8477c7f
no nav underline glitch
2016-12-09 13:51:23 +01:00
FinnStutzenstein
eca93594d7
Moving csv exports in seperate files ( closes #2728 )
2016-12-09 08:08:38 +01:00
Norman Jäckel
787805efa6
Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end
...
add precise text decoration (fixes #2576 )
2016-12-07 22:14:49 +01:00
sean
b1f4def743
add precise text decoration ( fixes #2576 )
2016-12-07 21:41:55 +01:00
Emanuel Schütze
c363fff3ba
Remove sidebox from assignment slide
...
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
2016-12-07 21:00:13 +01:00
Emanuel Schütze
8bd03bafdb
Rename first/last name to given name/surname ( Fixes #2564 ).
2016-12-07 19:49:25 +01:00
Norman Jäckel
4e5adb74e3
Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
...
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075
Merge pull request #2737 from FinnStutzenstein/Issue2730
...
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9
Use session cookies and store filter settings in sessionStorage
2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d
First attempt to mitigate the list / line number problem
2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194
Dynamic webpage title
2016-12-05 18:00:52 +01:00
Emanuel Schütze
a716910b63
Merge pull request #2734 from emanuelschuetze/issue2727
...
Hot fix for cache update while user import (Fixes #2727 ).
2016-12-05 13:25:11 +01:00
Emanuel Schütze
405fb1b9d1
Merge pull request #2733 from normanjaeckel/CategorySort
...
Category sort
2016-12-05 13:24:45 +01:00
Emanuel Schütze
b36560bffb
Hot fix for cache update while user import ( Fixes #2727 ).
2016-12-05 13:17:35 +01:00
Emanuel Schütze
3888632e14
Merge pull request #2735 from normanjaeckel/FixStatus
...
Fixed typo.
2016-12-05 13:09:25 +01:00
Norman Jäckel
e180b1df29
Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701 .
2016-12-05 12:59:46 +01:00
Norman Jäckel
8b6844675e
Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name
...
Typo in variable name
2016-12-05 12:58:56 +01:00
Norman Jäckel
d8c7eda587
Fixed typo.
2016-12-05 12:40:28 +01:00
Norman Jäckel
d0ed0cea23
Improved speed of motion numbering.
2016-12-03 20:57:00 +01:00
Tobias Hößl
940fb14ad6
Typo in variable name
2016-12-03 14:50:39 +01:00
Emanuel Schütze
9009c9e2e9
Updated translations for EN/DE. Fix translation string.
2016-12-02 16:30:03 +01:00
Emanuel Schütze
486f0601eb
Merge pull request #2721 from FinnStutzenstein/AgendaTable
...
Agenda table
2016-12-02 15:59:57 +01:00
Emanuel Schütze
0698327427
Fix minor remarks for #2271 .
2016-12-02 15:49:21 +01:00
Emanuel Schütze
4c37fd8e62
Merge pull request #2726 from normanjaeckel/FollowRecommendationButton
...
Added button to motion detail view to follow recommendation. Closed #…
2016-12-02 15:40:33 +01:00
FinnStutzenstein
ee5adb8fd2
New AgendaTable
2016-12-02 15:18:32 +01:00
Norman Jäckel
49dca65640
Added button to motion detail view to follow recommendation. Closed #2700 .
2016-12-02 14:57:45 +01:00