Commit Graph

3278 Commits

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