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

3451 Commits

Author SHA1 Message Date
Norman Jäckel
8380e97f93 Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks 
Add a parameter 'lineBreaks' to getTextByMode
 2017-04-19 14:45:24 +02:00
Emanuel Schütze
3614ba9451 Fixed compare of duplicated users while csv user import. 2017-04-19 13:38:06 +02:00
FinnStutzenstein
d78a7f91bc Fix clearing empty chat messages (fixes #3192) 2017-04-19 08:00:18 +02:00
Tobias Hößl
a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +02:00
Norman Jäckel
21418f632f Added support for password validation using Django or custom validators e. g. for minimum password length. 2017-04-13 16:20:38 +02:00
Emanuel Schütze
7d2785b9ec Merge pull request #3189 from FinnStutzenstein/pdf-zip 
Pdf zip
 2017-04-13 11:54:19 +02:00
Emanuel Schütze
768cc5f711 Merge pull request #3196 from emanuelschuetze/motionCommentRegression 
Fixed regression that opening of motion create form failed.
 2017-04-12 20:12:57 +02:00
Emanuel Schütze
cbccd17752 Fixed translation strings and updated German translations. 2017-04-12 20:03:07 +02:00
FinnStutzenstein
845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze
d1ff1e540f Fixed regression that opening of motion create form failed. 
Introduced with commit 3de4a2af1c.
 2017-04-12 15:17:47 +02:00
Emanuel Schütze
6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert 
Add local convert to Base64 (Fixes #2705)
 2017-04-12 15:09:43 +02:00
Sean Engelhardt
65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
Emanuel Schütze
2be9d45884 Merge pull request #3184 from FinnStutzenstein/Logo 
Support logos
 2017-04-12 14:49:59 +02:00
FinnStutzenstein
6c932aa77a Support logos 2017-04-12 14:28:46 +02:00
Emanuel Schütze
b9bab6fc17 Merge pull request #3191 from normanjaeckel/FreeUser 
User without permission to see users can now see some of them.
 2017-04-12 10:20:48 +02:00
Norman Jäckel
c4ec26c4c0 User without permission to see users can now see some required users. 
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
 2017-04-11 17:10:49 +02:00
Emanuel Schütze
3de4a2af1c Fixed empty motion comment field in motion update form. 
Motion comment values were not extracted. Concerns edit button in
motion list view only.
 2017-04-11 17:08:19 +02:00
Emanuel Schütze
23fec417f8 Fixed sorting of last speakers. 2017-04-11 15:55:45 +02:00
Norman Jäckel
cf9d204e18 Merge pull request #3187 from FinnStutzenstein/Issue3186 
Fixes #3060, fixes #3186.
 2017-04-07 16:47:42 +02:00
FinnStutzenstein
c86f6d3684 Do not reload on logout (fixes #2868) 2017-04-07 16:22:32 +02:00
FinnStutzenstein
cefdabc3d7 fixes #3060, fixes #3186 2017-04-07 15:16:09 +02:00
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze
1d1bf7366f Update version to 2.1.2-dev 2017-04-05 20:31:42 +02:00
Emanuel Schütze
bbbad71e2d Release 2.1.1 2017-04-05 20:30:07 +02:00
Norman Jäckel
757bbc62e5 Added version to getgeiss command. 2017-04-03 13:41:48 +02:00
FinnStutzenstein
44ed866210 fixes #3173 2017-03-31 12:28:13 +02:00
Norman Jäckel
7f55bc9377 Update version to 2.1.1-dev 2017-03-29 14:34:17 +02:00
Norman Jäckel
0086b513d0 Release 2.1 2017-03-29 14:33:00 +02:00
Emanuel Schütze
6d7f121a7f Merge pull request #3167 from emanuelschuetze/translations 
Updated final 2.1 translations for CS, ES, FR, PT, RU
 2017-03-29 14:30:02 +02:00
Emanuel Schütze
861e9674b8 Updated final 2.1 translations for CS, ES, FR, PT, RU 2017-03-29 14:25:02 +02:00
Emanuel Schütze
bb74e7eaa9 Merge pull request #3165 from normanjaeckel/MotionCreateFix 
Fixed creating motion for users with comments permissions.
 2017-03-28 21:13:39 +02:00
Norman Jäckel
4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Emanuel Schütze
9e96db894c Merge pull request #3159 from FinnStutzenstein/Issue3140 
fixing validate_html and motion saving (fixes #3140)
 2017-03-28 19:44:52 +02:00
FinnStutzenstein
d9e3da87f5 fixing validate_html and motion saving (fixes #3140) 
using PATCH
 2017-03-28 19:39:06 +02:00
Emanuel Schütze
ba4a408f5e Merge pull request #3156 from emanuelschuetze/issue-3099 
Disable edit button and hide remove button if election is finished.
 2017-03-28 14:47:09 +02:00
Emanuel Schütze
7ab95773eb Disable edit button and hide remove button if election is finished. (Fixed #3099) 2017-03-28 14:29:32 +02:00
Norman Jäckel
0ab2503fdc Merge pull request #3162 from FinnStutzenstein/assignmentOrder 
Fixing order for assignment poll form and translation for slide (fixe…
 2017-03-28 13:39:09 +02:00
Emanuel Schütze
c4a4773074 Merge pull request #3157 from normanjaeckel/FixDeletedReferenceProjector 
Fixed bug when reference projector for list of speakers slide is dele…
 2017-03-28 10:06:12 +02:00
FinnStutzenstein
72ceac3510 Fixing order for assignment poll form and translation for slide (fixes #3160, fixes #3161) 2017-03-28 09:58:02 +02:00
Norman Jäckel
619fc29cd4 Delete a file from filesystem when mediafile is deleted/destroied via REST api. Fixed #3146. 2017-03-28 00:17:55 +02:00
Norman Jäckel
d6af67d1df Fixed bug when reference projector for list of speakers slide is deleted. Fixed #3076. 2017-03-27 23:53:35 +02:00
Norman Jäckel
bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Norman Jäckel
9ffb008eb0 Merge pull request #3154 from emanuelschuetze/issue-3151 
Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151).
 2017-03-27 12:31:52 +02:00
Norman Jäckel
c741ddb909 Merge pull request #3155 from emanuelschuetze/issue3144 
Fixed wrong cancel function in mediafile form. (Fixed #3144)
 2017-03-27 12:25:24 +02:00
Emanuel Schütze
f971696130 Fixed wrong cancel function in mediafile form. (Fixed #3144) 2017-03-27 11:19:06 +02:00
Emanuel Schütze
fa76cb2866 Fixed linebreaks in pdf. 2017-03-27 11:17:04 +02:00
Emanuel Schütze
461be41a64 Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151). 
To remove the 'contextmenu' plugin also the 'liststyle' and 'tabletools' plugins
have to removed.
 2017-03-27 10:09:27 +02:00
Tobias Hößl
0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Tobias Hößl
d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel
33a61cb340 Merge pull request #3139 from emanuelschuetze/diff-mode-pdf 
Cleanup pdf parsing code for indentation fix in diff mode.
 2017-03-24 14:50:46 +01:00
Norman Jäckel
4964c2e84e Merge pull request #3138 from FinnStutzenstein/CountdownBug 
Fixing countdown default time
 2017-03-24 14:50:35 +01:00
Norman Jäckel
359ad0f60c Merge pull request #3137 from FinnStutzenstein/Issue3053 
watch for projector resolution change (fixes #3053)
 2017-03-24 14:47:09 +01:00
Norman Jäckel
85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103 
Improving creation of ballots (fixes #3103)
 2017-03-24 14:46:25 +01:00
Emanuel Schütze
9472eec69b Cleanup pdf parsing code for indentation fix in diff mode. 2017-03-24 09:35:13 +01:00
FinnStutzenstein
7eef45cd51 Fixing countdown default time 2017-03-24 09:23:28 +01:00
FinnStutzenstein
ab245b86a8 watch for projector resolution change (fixes #3053) 2017-03-24 08:46:18 +01:00
FinnStutzenstein
0220a03350 fixing test and inform_changed_data call 2017-03-24 08:14:08 +01:00
Norman Jäckel
5cd3b73725 Merge pull request #3135 from emanuelschuetze/projector-scroll-direction 
Switch projector scroll direction
 2017-03-23 23:24:02 +01:00
Norman Jäckel
e93a2f9f8e Merge pull request #3134 from normanjaeckel/IdentifierWahnsinn 
Fixed bug when creating multiple motions at once (problem with unique…
 2017-03-23 23:23:40 +01:00
Emanuel Schütze
57025b9792 Switch projector scroll direction 
- button 'arrow down': moves the visible part of the projector down
  (forward = text scrolls from bottom to top)
- button 'arrow up': moves the visible part of the projector up
  (backward = text scrolls from top to bottom)

Reverts change from #3094.
 2017-03-23 10:51:40 +01:00
Norman Jäckel
ced3f6d697 Fixed bug when creating multiple motions at once (problem with unique motion identifier). Fixed #3062. 2017-03-23 00:47:41 +01:00
Norman Jäckel
f34c24947a Merge pull request #3133 from emanuelschuetze/order-summary 
Fixed wrong order of change recommendations in summary box in PDF.
 2017-03-23 00:27:47 +01:00
Norman Jäckel
cd105f2271 Merge pull request #3132 from CatoTH/pdf-inline-diff-remove-extra-spaces 
Remove erroneous margin around inline diff paragraphs in PDF
 2017-03-23 00:27:27 +01:00
Norman Jäckel
5d074136be Merge pull request #3131 from tsiegleauq/change-reco-pdf-paragraphs 
adjust indentation for new insertions in PDF
 2017-03-23 00:26:25 +01:00
Emanuel Schütze
bd5ccb62ba Fixed wrong order of change recommendations in summary box in PDF. 2017-03-22 22:14:07 +01:00
sean
8324dbba16 adjust indentation for new insertions in PDF 2017-03-22 21:57:56 +01:00
Tobias Hößl
45cac43193 Remove erroneous margin around inline diff paragraphs in PDF 2017-03-22 20:54:56 +01:00
Emanuel Schütze
e5028f7ef2 Merge pull request #3127 from emanuelschuetze/issue3112 
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, #3038)
 2017-03-22 15:54:38 +01:00
Emanuel Schütze
2571d83195 Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, fixed #3038). 
- Provided csv header fields as meta data while csv import (#3038).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
 2017-03-22 15:37:08 +01:00
Emanuel Schütze
0c3ecb0acb Merge pull request #3129 from tsiegleauq/issue2811-more-parsing-issues 
fix pdf style parsing issue (fixes #2811)
 2017-03-22 15:28:05 +01:00
sean
bb5394eb36 fix pdf style parsing issue (fixes #2811) 2017-03-22 14:57:08 +01:00
Norman Jäckel
4f3fdf1699 Merge pull request #3125 from CatoTH/pass-line-numbers-through-diff 
Beginning: passing line numbers through the diff
 2017-03-22 14:24:23 +01:00
Emanuel Schütze
b6e1b3fc67 Updated translations (Fixed #2955) 2017-03-22 12:52:11 +01:00
Tobias Hößl
c912811bd3 Beginning: passing line numbers through the diff 2017-03-22 12:21:45 +01:00
Norman Jäckel
6b253ef4b7 Merge pull request #3124 from emanuelschuetze/tooltip 
Fixed hidden tooltip content in motion toolbar.
 2017-03-22 10:57:51 +01:00
Emanuel Schütze
af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +01:00
Emanuel Schütze
19d16a1ea7 Show username if first and last name is empty (Fixed #3121) 2017-03-22 09:13:33 +01:00
Emanuel Schütze
869105dc40 Minor fixes 
- Added motion change recommendations to full text search.
- Show csv/docx export entries in list views for manager only.
 2017-03-22 08:47:32 +01:00
Norman Jäckel
861df5f5c1 Merge pull request #3120 from emanuelschuetze/diff-box 
Hide change recommendation diff-box in diff version for normal users.
 2017-03-21 23:05:02 +01:00
Norman Jäckel
e57afb9ab4 Merge pull request #3118 from emanuelschuetze/issue3081 
Allow style attributes for about field in user detail template (Fixed #3081)
 2017-03-21 23:03:27 +01:00
Emanuel Schütze
70de0a6e4b Hide change recommendation diff-box in diff version for normal users. 2017-03-21 20:47:58 +01:00
Norman Jäckel
b7d3acc94b Merge pull request #3114 from emanuelschuetze/assignment-fixes 
Fixed assignment JS bugs (Fixed #3099)
 2017-03-21 17:28:03 +01:00
Norman Jäckel
c39d003f01 Merge pull request #3113 from FinnStutzenstein/assignment-tabs 
Fixes Ballot tabs on create/delete (fixes #3058)
 2017-03-21 17:22:15 +01:00
Norman Jäckel
a412ff9eb3 Merge pull request #3094 from FinnStutzenstein/Issue3092 
Fixes #3092, fixes #2453 and fixed motion projection bug
 2017-03-21 17:20:49 +01:00
Norman Jäckel
bd8c7f61a0 Merge pull request #3085 from tsiegleauq/issue3025-duplicated-header 
fix double PDF Head in Motions (fixes #3025)
 2017-03-21 17:19:36 +01:00
Emanuel Schütze
0036029709 Fixed double paragraphs in motion pdf which contains links (Fixed #3095). 2017-03-21 16:08:39 +01:00
Emanuel Schütze
74811a4529 Allow style attributes for about field in user detail template (Fixed #3081) 2017-03-21 15:19:22 +01:00
Emanuel Schütze
bfa8076862 Updated German translations (Fixed #3079) 2017-03-21 14:55:14 +01:00
FinnStutzenstein
a0531a3268 Fixes Ballot tabs on create/delete (fixes #3058) 2017-03-21 14:37:10 +01:00
FinnStutzenstein
4f84a9f752 Fixes #3092, fixes #2453 and fixed motion projection bug 2017-03-21 14:29:06 +01:00
Emanuel Schütze
0852c14524 Updated translations (EN+DE). 2017-03-21 14:09:20 +01:00
Emanuel Schütze
0082410cc8 Fixed assignment JS bugs (Fixed #3099) 2017-03-21 13:57:48 +01:00
FinnStutzenstein
08bd1251a7 More speed improvements 2017-03-21 11:08:52 +01:00
Emanuel Schütze
b8742bcb8f Merge pull request #3061 from FinnStutzenstein/Issue3036 
Let users with comments management perms edit them (fixes #3036)
 2017-03-21 10:49:13 +01:00
FinnStutzenstein
238b4b7f0a Improving creation of ballots (fixes #3103) 2017-03-21 10:33:36 +01:00
FinnStutzenstein
a638b05538 Let users with comments management perms edit them (fixes #3036), fixes #3090 2017-03-21 09:59:49 +01:00
Norman Jäckel
42cf987aed Merge pull request #3096 from CatoTH/Issue3077-highlight-inline-diff 
Add an explicit line highlighting function for the diff
 2017-03-20 22:09:18 +01:00
Tobias Hößl
a3c7eeb091 Add an explicit line highlighting function for the diff 2017-03-18 15:24:19 +01:00
FinnStutzenstein
542cb67d59 Fixing the sidebar, fixes #3068 2017-03-17 12:24:40 +01:00
Sean Engelhardt
259e338b17 fix double PDF Head in Motions (fixes #3025) 2017-03-16 23:17:25 +01:00
Emanuel Schütze
b53843c17e Several template fixes 
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
 2017-03-10 22:46:01 +01:00
Emanuel Schütze
26c9937220 Merge pull request #3075 from emanuelschuetze/issue3066 
Fixed autoupdate error after deleting a slide (Fixed #3066).
 2017-03-09 08:58:24 +01:00
Emanuel Schütze
1be2cbb8dc Fixed autoupdate error after deleting a slide (Fixed #3066). 2017-03-09 08:51:57 +01:00
Norman Jäckel
07faf1078b Merge pull request #3074 from emanuelschuetze/fixes2 
Hide empty placeholder of ui-tree in sort templates.
 2017-03-09 00:05:28 +01:00
Emanuel Schütze
780b9e2e9a Hide empty placeholder of ui-tree in sort templates. 2017-03-08 23:07:22 +01:00
Norman Jäckel
82e20ee5a7 Merge pull request #3073 from emanuelschuetze/fixes 
Minor template fixes
 2017-03-08 23:00:26 +01:00
Norman Jäckel
27bc6a7df4 Merge pull request #3072 from CatoTH/fix-diff-test-cases 
Fixes broken diff test cases
 2017-03-08 22:51:37 +01:00
Emanuel Schütze
3717f63d12 Minor template fixes 
- More column width in all-motions pdf.
  Order categories by prefix.
- Fixed using translations in error messages.
  Removed unused pdf-status template.
 2017-03-08 22:46:45 +01:00
Tobias Hößl
c3bd85e5ee Diff-Bugfix: don't repeat unchanged words 2017-03-08 21:29:34 +01:00
Tobias Hößl
a6de228f56 Prevent broken HTML like <ins>Test</p></ins> 2017-03-08 20:38:02 +01:00
Tobias Hößl
9f71afa602 Fixes broken diff test cases + Bugfix for: TypeError: Failed to execute 'insertBefore' on 'Node' 2017-03-08 20:10:32 +01:00
Sean Engelhardt
6dc52c6fe2 Add strike command to HTML PDF parser (Fixes #3069) 2017-03-08 15:47:40 +01:00
Emanuel Schütze
f457720d29 Update version to 2.1b5-dev 2017-03-07 21:22:53 +01:00
Emanuel Schütze
c788e3bfab Release 2.1b4 2017-03-07 21:19:31 +01:00
FinnStutzenstein
cc0049b55b Adding agenda/topics app, fixes user app 2017-03-07 15:02:39 +01:00
Norman Jäckel
14ec6c0f44 Improved autoupdate on permission change. 2017-03-06 17:42:27 +01:00
FinnStutzenstein
bcc85f9cad Autoupdate on user permission change. 2017-03-06 15:08:23 +01:00
Norman Jäckel
688b247bcc Added flag to use Geiss. Small changes for the new getgeiss command. Changed path of collected statics. 2017-03-06 14:39:55 +01:00
Oskar Hahn
e3cc592f70 Added the command getgeiss. Work on start script to use Geiss. 2017-03-06 14:39:26 +01:00
Norman Jäckel
8b710b0b13 Merge pull request #3056 from emanuelschuetze/cleanup 
Removed unused ubuntu fonts (from old pdf generation).
 2017-03-05 23:54:09 +01:00
Norman Jäckel
0c5746b349 Merge pull request #3055 from emanuelschuetze/fix 
Fixed iframeoverlay and missing ErrorMessage.
 2017-03-05 22:43:10 +01:00
Emanuel Schütze
1d6326fb1b Removed unused ubuntu fonts (from old pdf generation). 2017-03-05 22:40:38 +01:00
Emanuel Schütze
d92328674a Fixed iframeoverlay and missing ErrorMessage. 2017-03-05 22:27:14 +01:00
Emanuel Schütze
2d65ecbc3a Updated all translations. 
Added Russia as new language.
 2017-03-05 22:25:48 +01:00
Emanuel Schütze
c6ced4e4a0 Merge pull request #3051 from emanuelschuetze/issues-2142 
Excluded already elected persons for new ballot (Fixed #2142)
 2017-03-05 21:30:35 +01:00
Emanuel Schütze
ff840ab3c6 Excluded already elected persons for new ballot (Fixed #2142) 
- Reorder assignment ballot tabs in detail template.
- Removed logic to set phase automatically to 'finished' if
  elected candidates reached, because autoupdate makes it unreliable.
 2017-03-05 21:25:22 +01:00
Norman Jäckel
4c2b13a142 Merge pull request #3052 from emanuelschuetze/mobile-theme 
Responsive design improvements
 2017-03-05 20:34:50 +01:00
Norman Jäckel
32aaa28637 Merge pull request #3050 from CatoTH/bugfix-inline-diff-when-replacing-paragraphs 
Improve the diff when a paragraph is replaced by another one
 2017-03-05 20:25:43 +01:00
Norman Jäckel
6525b79774 Merge pull request #3047 from emanuelschuetze/projector-control 
Inscreased projector scroll distance.
 2017-03-05 20:23:56 +01:00
Norman Jäckel
0ca8fa57ed Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers 
Bugfix for missing line numbers in diff view in the projector
 2017-03-05 20:23:35 +01:00
Norman Jäckel
16743cd9b8 Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix 
Handle STRIKE-tags correctly in line numbering - fixes #3027
 2017-03-05 20:22:59 +01:00
Norman Jäckel
659c7858eb Merge pull request #3043 from emanuelschuetze/category-sort-template 
Added motion detail links to category sort view.
 2017-03-05 20:22:40 +01:00
Norman Jäckel
1fdb3a4f2a Merge pull request #3042 from emanuelschuetze/3028 
Improved go to line number tooltip/popup. (#3028)
 2017-03-05 20:20:25 +01:00
Norman Jäckel
a33d504c6b Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements 
Bugfix for #3024 - escaping HTML tags
 2017-03-05 20:19:24 +01:00
Emanuel Schütze
f67afd1823 Responsive design improvements 
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
  controls as dropdown (for small/extra small devices) or as
  button group (for medium/large devices).
 2017-03-05 00:30:00 +01:00
Tobias Hößl
6577287e26 Improve the diff when a paragraph is replaced by another one 2017-03-04 20:48:18 +01:00
Emanuel Schütze
65d93d1b66 Inscreased projector scroll distance. 
Allows faster scrolling for long slides.
 2017-03-04 16:52:27 +01:00
Tobias Hößl
0022df2aff Bugfix for missing line numbers in diff view in the projector 2017-03-04 16:42:02 +01:00
Tobias Hößl
c8006588c5 Handle STRIKE-tags correctly in line numbering 2017-03-04 16:17:48 +01:00
Emanuel Schütze
fa395d6cc2 Added motion detail links to category sort view. 2017-03-04 16:07:05 +01:00
Emanuel Schütze
a9144b6d5b Improved go to line number tooltip/popup. (#3028) 2017-03-04 16:00:54 +01:00
Tobias Hößl
e698d81f9f Bugfix for #3024 - escaping HTML tags 2017-03-04 15:51:33 +01:00
Emanuel Schütze
3903be5d6b Fixed switching between motion versions (Fixed #2363) 
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
  active when user change version)
 2017-03-03 17:03:32 +01:00
Emanuel Schütze
95c19159f8 Merge pull request #3026 from CatoTH/bugfix-line-numbering-diff 
Several bug fixes in the diff
 2017-03-03 15:26:44 +01:00
Tobias Hößl
74f40395d9 Several bug fixes in the diff 2017-03-03 15:16:51 +01:00
Norman Jäckel
cc6d2a6ca9 Merge pull request #3035 from FinnStutzenstein/Issue3003 
Always provide the list of speakers (closes #3003)
 2017-03-03 14:53:55 +01:00
Emanuel Schütze
91cb124918 Merge pull request #3018 from FinnStutzenstein/ErrorMessages 
Error messages and global messaging service (closes #2949)
 2017-03-03 14:52:00 +01:00
FinnStutzenstein
9c89f4d59c Error messages and global messaging service (fixes #2949, fixes #1774) 2017-03-03 14:36:31 +01:00
FinnStutzenstein
9fbbfe0f50 Always provide the list of speakers (closes #3003) 2017-03-03 14:35:55 +01:00
Norman Jäckel
4744e1ca99 Merge pull request #3034 from FinnStutzenstein/TemplateFixes 
Small template improvements
 2017-03-03 14:23:05 +01:00
FinnStutzenstein
606c17ef43 Small template improvements 2017-03-03 11:53:33 +01:00
Norman Jäckel
5a821ecf49 Fixed use of PATCH and PUT. Fixed #1871. 2017-02-27 17:20:57 +01:00
Norman Jäckel
96cbf17e72 Merge pull request #3015 from emanuelschuetze/fix-topic-form 
Fixed forms (added missing operator).
 2017-02-27 15:18:49 +01:00
Emanuel Schütze
65fcd8e9d6 Fixed forms (added missing operator). 
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
 2017-02-27 10:02:43 +01:00
Emanuel Schütze
7630553303 Workaround to prevent screen jumps in assignment detail (Fixed #2555). 
Fixed also unexpected ballot creation while uib-tab updates.
Now button instead of tab is used for creating new ballot.
 2017-02-24 22:33:23 +01:00
Emanuel Schütze
e063ab8fe8 Updated EN and DE translations files. 2017-02-24 16:20:42 +01:00
Emanuel Schütze
2215d7159a Merge pull request #3001 from emanuelschuetze/user-profile 
Reduced user profile form
 2017-02-24 16:04:39 +01:00
Emanuel Schütze
04223b0107 Merge pull request #3009 from FinnStutzenstein/ClosManagement 
Manageview for Current list of speakers(closes #3007)
 2017-02-24 16:03:01 +01:00
FinnStutzenstein
c093796a17 Manage view for Current list of speakers (closes #3007) 2017-02-24 15:48:08 +01:00
Emanuel Schütze
6b74bf635d Merge pull request #2993 from emanuelschuetze/motion-poll-log 
Added motion log entry for creating polls.
 2017-02-24 15:44:53 +01:00
Emanuel Schütze
e67d67a07f Merge pull request #3006 from FinnStutzenstein/Issue2894 
hide 'show as agenda item' for non authorized users (fixes #2894)
 2017-02-24 15:44:25 +01:00
Emanuel Schütze
045c65de49 Merge pull request #3008 from FinnStutzenstein/Issue2636 
Remove scrolling to a line on projector (closes #2636)
 2017-02-24 15:38:18 +01:00
Emanuel Schütze
5d38ca8c68 Merge pull request #3005 from FinnStutzenstein/Issue3004 
Fixing create view for amendments (fixing #3004)
 2017-02-24 15:37:46 +01:00
Emanuel Schütze
4ebc238ea2 Added motion log entry for creating polls. 
Use timezone support for motion log time.
 2017-02-24 15:31:26 +01:00
Norman Jäckel
5b4ca84306 Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984. 2017-02-24 15:22:55 +01:00
FinnStutzenstein
8a8755f22d Fixing create view for amendments (fixing #3004) 2017-02-24 15:16:12 +01:00
FinnStutzenstein
803f9dba96 Remove scrolling to a line on projector (closes #2636) 2017-02-24 10:31:48 +01:00
FinnStutzenstein
1c1a2bef09 hide 'show as agenda item' for non authorized users (fixes #2894) 2017-02-24 10:15:28 +01:00
Emanuel Schütze
7de2f5c79c Reduced user profile form 2017-02-22 23:31:50 +01:00
Emanuel Schütze
bf0b5d5062 Added 'reject all change recommendations' button. 2017-02-22 23:08:46 +01:00
Emanuel Schütze
4168153ba3 Added extension for state and recommendation names in dropdown. 2017-02-22 21:31:47 +01:00
Emanuel Schütze
7f08a09497 Merge pull request #2992 from FinnStutzenstein/CleanUp 
Collection name to CamelCase (fixes #2983)
 2017-02-22 19:44:49 +01:00
FinnStutzenstein
5374b2f398 Collection name to CamelCase (fixes #2983) 2017-02-22 19:12:38 +01:00
Emanuel Schütze
60ebac9f8b Merge pull request #2994 from FinnStutzenstein/Improvements 
Usability improvements
 2017-02-22 19:03:42 +01:00
FinnStutzenstein
da89bf5a83 Usability improvements 2017-02-22 16:58:52 +01:00
Emanuel Schütze
8ff247b555 Allowed to export/import initial user password. 2017-02-22 08:38:14 +01:00
Emanuel Schütze
e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +01:00
Norman Jäckel
4d3a45c8fb Merge pull request #2991 from emanuelschuetze/css-fixes 
CSS improvements for projector sidebar on small devices.
 2017-02-20 20:39:22 +01:00
Norman Jäckel
ebf9278b79 Merge pull request #2990 from emanuelschuetze/fixProjection 
Fix motion projection.
 2017-02-20 20:38:59 +01:00
Emanuel Schütze
acf996a720 CSS improvements for projector sidebar on small devices. 2017-02-20 19:46:44 +01:00
Emanuel Schütze
d79cea9a8b Fix motion projection. 2017-02-20 18:44:37 +01:00
Norman Jäckel
1e9c7273ae Merge pull request #2987 from emanuelschuetze/issue2963 
Fixed placement of 'back' button in motion block view (Fixed #2963).
 2017-02-18 00:06:00 +01:00
Emanuel Schütze
a06d969dc3 Updated translation resources and German translations. 2017-02-17 23:21:54 +01:00
Emanuel Schütze
58f499283f Fixed translation strings. 2017-02-17 23:21:50 +01:00
Emanuel Schütze
e4bd44082d Fixed placement of 'back' button in motion block view (Fixed #2963). 2017-02-17 22:32:17 +01:00
Emanuel Schütze
6bad8e8cc6 Merge pull request #2973 from FinnStutzenstein/Dialogs 
Dialogs for some views
 2017-02-17 22:20:59 +01:00
Norman Jäckel
e35e65b7d4 Merge pull request #2985 from normanjaeckel/AgendaSortCheck 
Added check for hierarchical loops in agenda sort view. See #2972.
 2017-02-17 22:08:23 +01:00
Emanuel Schütze
9ae1d7e59a Show allert in sort template if agenda sort request failed. 2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019 Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector 
Send also motion.state.workflow to motion block slide.
 2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819 Send also motion.state.workflow to motion block slide. 
to show recommendation names in slide template
 2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3 Added check for hierarchical loops in agenda sort view. See #2972. 2017-02-17 17:20:30 +01:00
Norman Jäckel
56420aa0f5 Merge pull request #2982 from emanuelschuetze/recommendation-config 
Added new config for default change recommendation view.
 2017-02-17 16:33:36 +01:00
Norman Jäckel
935a2a7245 Merge pull request #2980 from emanuelschuetze/pdf-worker-fix 
Fixed placeholder replacement in pdf worker.
 2017-02-17 16:29:09 +01:00
Norman Jäckel
ee66ee3d72 Merge pull request #2979 from FinnStutzenstein/Issue2951 
fixing #2951
 2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate 
Fixing MotionBlock autoupdate and added projector button (fixes #2958)
 2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a Added new config for default change recommendation view. 
Use this default view for motion catalog pdf and motion detail view.
 2017-02-17 16:03:00 +01:00
Emanuel Schütze
a804362e16 Fixed placeholder replacement in pdf worker. 
Make it more dynamic by searching recursively.
 2017-02-17 15:11:28 +01:00
FinnStutzenstein
735dbcf109 Better dialog handling. Many fixes. 2017-02-17 14:58:35 +01:00
FinnStutzenstein
a5398a491c fixing #2951 2017-02-17 14:54:32 +01:00
Emanuel Schütze
9a1e45682c Merge pull request #2976 from FinnStutzenstein/templateFixes 
Update mediafile form
 2017-02-17 13:58:49 +01:00