Commit Graph

3384 Commits

Author SHA1 Message Date
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