ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,804 Commits 6 Branches 42 Tags 64 MiB
e2d710a84c
Commit Graph

593 Commits

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