FinnStutzenstein
ca8ee3edd6
Splitup comment see and manage permissions for motion comments
2018-02-16 14:09:32 +01:00
Emanuel Schütze
8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands
...
Escape Ampersands - fixes #3563
2018-02-15 08:23:54 +01:00
FinnStutzenstein
3ba39c37c1
Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage ( fixes #3558 ).
2018-02-14 10:25:51 +01:00
Tobias Hößl
a345815b57
Escape Ampersands - fixes #3563
2018-02-13 16:43:07 +01:00
Emanuel Schütze
a6cdb75093
Merge pull request #3564 from FinnStutzenstein/improvements
...
Fixed email translations, motion sorting, undefined in DOCX, reduced …
2018-02-11 20:12:25 +01:00
FinnStutzenstein
dea62c8394
Fixed wrong css hierachy
2018-02-06 15:53:24 +01:00
FinnStutzenstein
0b04b7478f
Fixed email translations, motion sorting, undefined in DOCX, reduced motion search
2018-02-02 12:48:01 +01:00
FinnStutzenstein
39e49f7226
Finally removed AgendaAutoupdate
2018-01-29 09:18:15 +01:00
Norman Jäckel
4aad16db4f
Enhance setup of new agenda items for topics, motions and motion blocks.
2018-01-29 09:18:07 +01:00
Norman Jäckel
4a78298f94
Supported server side setup of new agenda items (type and parent).
2018-01-25 23:14:26 +01:00
FinnStutzenstein
60b6ef1415
Repair the master
2018-01-23 14:02:16 +01:00
Tobias Hößl
c7729a6619
Diff-Bugfix: Whitespace was inserted after <br>
2018-01-22 09:12:36 +01:00
Tobias Hößl
e4da7905ca
Fixes an edge case in the diff
2018-01-21 10:21:22 +01:00
Jochen Saalfeld
612924c087
save language selection to session storage
...
and adding @FinnStutzenstein remarks
adding changelog entry
2018-01-20 20:57:53 +01:00
Tobias Hößl
b574502a37
Bugfix: Diff and Line breaks at dashes
2018-01-20 11:48:46 +01:00
Finn Stutzenstein
cfefd1c7b7
Merge pull request #3507 from FinnStutzenstein/css
...
split up css classes
2018-01-16 09:41:08 +01:00
FinnStutzenstein
cc75452691
split up css classes using sass
2018-01-16 08:38:11 +01:00
FinnStutzenstein
264b6f7d34
Hide identifier field in motion update form if the user is delegate ( fixes #3528 )
2018-01-12 08:08:01 +01:00
FinnStutzenstein
5cf82e5921
fixed ValidationError
2018-01-08 10:41:09 +01:00
Emanuel Schütze
3271ff368c
Merge pull request #3516 from FinnStutzenstein/delegateDelete
...
Allow to delete own motions
2017-12-15 10:41:16 +01:00
FinnStutzenstein
a934ab3845
Allow to delete own motions.
2017-12-15 10:20:40 +01:00
Emanuel Schütze
2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest
...
Send invitation emails
2017-12-15 08:29:09 +01:00
FinnStutzenstein
2220112d27
Send invitation emails with OpenSlides login.
2017-12-15 08:16:29 +01:00
Emanuel Schütze
3d264683ff
Assignment improvements
...
- Use ckeditor for assignment description field (e.g. for candidatures
using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
for candidate rows.
2017-12-05 14:04:35 +01:00
Emanuel Schütze
95be44e7f7
Updated German translations.
2017-12-01 12:07:50 +01:00
Emanuel Schütze
a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation
...
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
2017-12-01 09:34:56 +01:00
FinnStutzenstein
b6a2530618
Reduce autoupdates by adding a follow_recommendation view ( fixes #3488 , fixes #3489 )
2017-12-01 09:17:50 +01:00
FinnStutzenstein
34ac4a347c
Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout
2017-12-01 09:16:48 +01:00
FinnStutzenstein
2a0a0049b0
New change recommendation type other
2017-11-24 13:30:19 +01:00
Norman Jäckel
3161bdaa05
Merge pull request #3498 from FinnStutzenstein/MotionHref
...
Give motions by id in state and recommendation.
2017-11-21 20:41:47 +01:00
FinnStutzenstein
2bdaf85b67
Give motions by id in state and recommendation.
2017-11-21 16:56:52 +01:00
FinnStutzenstein
79e6e31229
Extended motion export dialog ( fixes #3493 )
...
- Cleanup formfield types
- Remove complete columns in the csv
2017-11-21 16:27:05 +01:00
Emanuel Schütze
de47da646b
Merge pull request #3492 from emanuelschuetze/templateImprovements
...
Template improvements for motions and projector
2017-11-15 12:08:24 +01:00
Emanuel Schütze
702b452b6e
Template improvements for motions and projector
...
- Use same title layout for (current) list of speakers slide.
- Set default choose for current list of speakers slide to 'project as slide'
if more than one projectors available.
- Remove additional control bottons in list of speakers view to stop/end current/next speech.
(User should better use the start/stop buttons behind the speaker names.)
- Fix typo in projection defaults.
- Set sidebox in motion slide to fix position (should not scroll).
- Fix order of amendments in motion detail template.
- Increase font size of motion block items on slide.
2017-11-12 17:23:05 +01:00
FinnStutzenstein
db9e132e08
Fix the motion detail template
2017-11-10 17:27:39 +01:00
Emanuel Schütze
b76fd2303c
Do not show identifier in motion detail template twice.
2017-11-03 17:02:55 +01:00
FinnStutzenstein
b7da8cf7ec
Do not show identifier in motion slide twice
2017-11-03 13:06:51 +01:00
Emanuel Schütze
bed42b5c66
Merge pull request #3472 from FinnStutzenstein/templateChanges
...
Template changes and IE fix
2017-11-03 12:55:17 +01:00
FinnStutzenstein
9e46924c77
Template changes and IE fix
...
- Fix IE11 that projector shows JS error if 'startsWith' is used.
Projector was updated very slowly.
- Hide the valid/invalid/casted ballot rows on projector if empty.
- Use 80% width for motion reason in PDF.
2017-11-03 12:36:03 +01:00
Emanuel Schütze
432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent
...
Do not zoom slideheaders
2017-11-03 12:33:42 +01:00
FinnStutzenstein
323534700c
Do not zoom slideheaders
2017-11-03 12:17:29 +01:00
FinnStutzenstein
1236fee7ee
Showing the number of next speakers in motion list view
2017-11-03 10:29:34 +01:00
Tobias Hößl
e18f22f200
Break lines in nodes that have already been parsed
2017-11-02 09:16:36 +01:00
Emanuel Schütze
c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff
...
Better handling of inserted paragraphs
2017-11-02 09:11:28 +01:00
FinnStutzenstein
5e8662e470
Motion optimizations
2017-11-02 08:50:33 +01:00
Tobias Hößl
6891471c45
Better handling of inserted paragraphs
2017-11-01 10:29:18 +01:00
Emanuel Schütze
a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle
...
Show motion identifier in (current) list of speakers
2017-11-01 10:23:19 +01:00
FinnStutzenstein
39bd6653f0
Show motion identifier in (current) list of speakers
2017-11-01 09:58:22 +01:00
Norman Jäckel
6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2
...
try/catch for inconsistent data
2017-10-29 17:59:18 +01:00
Norman Jäckel
e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy
...
Update state field when following a recommendation
2017-10-29 17:53:30 +01:00
Emanuel Schütze
b50d5e10ee
Added '!' as new split separator for better motion diff view.
2017-10-27 14:50:38 +02:00
FinnStutzenstein
1c508765fa
Update state field when following a recommendation
2017-10-27 12:36:31 +02:00
Tobias Hößl
5fd8741fdb
try/catch for inconsistent data
2017-10-24 20:06:04 +02:00
Norman Jäckel
73407133bd
Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange
...
Go to top on a page change
2017-10-22 15:35:12 +02:00
Norman Jäckel
d175e4a200
Merge pull request #3452 from FinnStutzenstein/Plugin
...
Added TemplateHooks for the protocol plugin.
2017-10-19 21:21:49 +02:00
FinnStutzenstein
9c657016e3
Added TemplateHooks for the protocol plugin.
2017-10-18 11:35:22 +02:00
Emanuel Schütze
4ff7d0b7dc
Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio
...
Disable change ratio detection / Fix marking unchanged dangling line as changed
2017-10-16 13:05:35 +02:00
Tobias Hößl
e651c124e4
Disable change ratio detection / Fix for marking unchanged line as changed
2017-10-16 12:27:44 +02:00
Emanuel Schütze
5eda3131a8
Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements
...
Motion template improvements (Fixed #3303 )
2017-10-16 12:10:00 +02:00
Emanuel Schütze
c02f00da7d
Merge pull request #3446 from FinnStutzenstein/Identifier
...
New motion identifier behavior
2017-10-16 12:08:53 +02:00
Emanuel Schütze
17959bd9c5
Motion template improvements ( Fixed #3303 )
...
- Sort categories drop downs by config value (name or prefix) (fixed #3303 ).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
2017-10-16 09:35:06 +02:00
Emanuel Schütze
721064700a
Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove
...
Move comments filter behind motion block filter
2017-10-13 23:38:45 +02:00
Norman Jäckel
611776d38c
Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth
...
Limit the reason display width
2017-10-13 18:35:47 +02:00
Norman Jäckel
9b64bd5646
Merge pull request #3438 from FinnStutzenstein/PDF
...
Fixing multiline headers in PDF
2017-10-13 18:21:34 +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
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
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
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
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
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
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
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
Tobias Hößl
da8f825d42
Sort attributes before applying the diff - fixes #3402
2017-09-16 14:06:12 +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
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
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
29f60fc6aa
Fixed motion detail style issues
...
- margin in motion diff view
- personal note box
2017-09-08 18:25:48 +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
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
Oskar Hahn
be94e97889
more typings
2017-09-03 18:34:55 +02:00
Emanuel Schütze
f4ac0dd30d
Fixed inline editing of motion reason.
2017-08-30 19:23:52 +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
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
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
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
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
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
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
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
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
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
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
FinnStutzenstein
a32b046fa5
Add the option to sort categories different in motion export.
2017-07-27 09:50:03 +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
Norman Jäckel
41a70f40df
Fixed error on category numbering. Fixed #3315 .
2017-07-05 22:13:54 +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
37eec7d99b
Minor Bugfixes ( fixes #3312 , fixes #3313 )
2017-06-29 08:59:41 +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
FinnStutzenstein
f42b6f0d37
fix not supported 'startsWith' function in IE11 ( fixes #3307 )
2017-06-21 15:28:43 +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
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
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
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
Norman Jäckel
913bec3e53
Renamed is_user_data_required to required_users. Fixed #3238 .
2017-05-22 16:08:52 +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
Tobias Hößl
7109c75246
Remove color styles insert .insert/.delete-Paragraphs - fixes #3247
2017-05-17 21:38:35 +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
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