Commit Graph

889 Commits

Author SHA1 Message Date
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
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
FinnStutzenstein
d1f0b69d35 Fixing PDF filenames on zip export if no identifier is given 2017-05-12 12:02:01 +02:00
FinnStutzenstein
17d9615631 Fixing error when downloading 2017-05-10 09:04:19 +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
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
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
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
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
FinnStutzenstein
349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
FinnStutzenstein
fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +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
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
Tobias Hößl
9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Tobias Hößl
a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +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
Sean Engelhardt
65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +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
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +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
FinnStutzenstein
d9e3da87f5 fixing validate_html and motion saving (fixes #3140)
using PATCH
2017-03-28 19:39:06 +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
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
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
Emanuel Schütze
bd5ccb62ba Fixed wrong order of change recommendations in summary box in PDF. 2017-03-22 22:14:07 +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
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
Emanuel Schütze
af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +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
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
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
FinnStutzenstein
4f84a9f752 Fixes #3092, fixes #2453 and fixed motion projection bug 2017-03-21 14:29:06 +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
a638b05538 Let users with comments management perms edit them (fixes #3036), fixes #3090 2017-03-21 09:59:49 +01:00
Tobias Hößl
a3c7eeb091 Add an explicit line highlighting function for the diff 2017-03-18 15:24:19 +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
1be2cbb8dc Fixed autoupdate error after deleting a slide (Fixed #3066). 2017-03-09 08:51:57 +01:00
Norman Jäckel
82e20ee5a7 Merge pull request #3073 from emanuelschuetze/fixes
Minor template fixes
2017-03-08 23:00:26 +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
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
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
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
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
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
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
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
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
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
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
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
e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +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
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
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
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
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
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
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
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +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
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
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
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
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
Sean Engelhardt
4eefde839b pdf w.o linen numbers and change rec. (fixes #2962) 2017-02-15 14:23:28 +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
FinnStutzenstein
b73c50a4f9 Fixed missing <p> tags for motion import and some improvements. 2017-02-10 09:11:45 +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
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
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
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
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
FinnStutzenstein
d55d374211 Prevent XSS-attacks (fixes #2871) 2017-01-30 21:04:41 +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
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
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
Emanuel Schütze
b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
FinnStutzenstein
2ac7df2ee6 Reorder projection of motions (fixes #2883) 2017-01-16 15:15:29 +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
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
Norman Jäckel
9250055e35 Merge pull request #2876 from emanuelschuetze/issue2763
Adapted motion DOCX template.
2017-01-15 12:21:27 +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
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
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
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
Norman Jäckel
a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
Emanuel Schütze
35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838
Fixing #2838
2017-01-14 10:40:57 +01:00
FinnStutzenstein
76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
Meinert Leinigen
d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +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
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
Emanuel Schütze
6502f36a90 Merge pull request #2796 from FinnStutzenstein/Issue2548
Project change recommendations
2017-01-09 09:27:46 +01:00
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +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
Maximilian Krambach
a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +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
cebfbf5b8d Merge pull request #2633 from normanjaeckel/SquishMigrations
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +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
Emanuel Schütze
a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +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
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
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
eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +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
405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort
Category sort
2016-12-05 13:24:45 +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
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
Emanuel Schütze
a1e33b99d4 Merge pull request #2718 from normanjaeckel/ApplyMotionText
Changed config to apply motion text for new amendmend. Closed #2714.
2016-12-02 08:51:46 +01:00
Norman Jäckel
81a01156c1 Changed config to apply motion text for new amendmend. Closed #2714. 2016-12-02 00:12:37 +01:00
Emanuel Schütze
52b9c651bb Fixed motion pdf layout
for voting result and summary change recommendations
2016-12-01 22:56:42 +01:00
Norman Jäckel
cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
2016-12-01 14:46:15 +01:00
Norman Jäckel
59599bfba0 Merge pull request #2712 from emanuelschuetze/fixes
Minor fixes (Fixes #2710)
2016-12-01 14:42:56 +01:00
Norman Jäckel
ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00
Norman Jäckel
639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Maximilian Krambach
32aaaf5b9e Majority calculation for assignments.
Majorities when config YN(A) and simple voting method.
2016-12-01 14:35:35 +01:00
Emanuel Schütze
670251fba9 Minor fixes (Fixes #2710)
- motion form: show supporters field
- motion block slide: show motion identifiers in columns
- item list: show open link for motion blocks
- use right pdfmake-dist name in bower.json
2016-12-01 14:29:31 +01:00
Emanuel Schütze
9440842e6a Merge pull request #2708 from emanuelschuetze/issue2626
Improved wording for recommendation config (Fixes #2626)
2016-12-01 11:29:29 +01:00
Emanuel Schütze
80f4cf8f2d Improved wording for recommendation config (Fixes #2626)
- updated config label and helptext
- added recommendation also to motion slide
2016-12-01 11:05:11 +01:00
Norman Jäckel
de00e35064 Merge pull request #2704 from tsiegleauq/motionDiffBox
Adds the diff-summary box for motions
2016-12-01 10:25:05 +01:00
Norman Jäckel
6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
Showing Diff inline
2016-12-01 10:24:18 +01:00