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
Norman Jäckel
c8f64783bc
Merge pull request #3063 from FinnStutzenstein/dev-guide
...
Updateing the instructions for big mode
2017-03-25 21:53:48 +01:00
FinnStutzenstein
100db66b8f
Updated instructions
...
Updated big mode and split up requiements_production
Some changes are made by normanjaeckel.
2017-03-25 21:31:30 +01:00
Emanuel Schütze
e90266091f
Merge pull request #3142 from CatoTH/bugfix-diff-regression
...
Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe51…
2017-03-25 12:26:21 +01: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
4dfc337626
Merge pull request #3126 from emanuelschuetze/update-translations-2
...
Updated translations (Fixed #2955 )
2017-03-22 12:58:05 +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
Norman Jäckel
9ced504908
Merge pull request #3123 from emanuelschuetze/issue3121
...
Show username if first and last name is empty (Fixed #3121 )
2017-03-22 10:57:30 +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
ae098b1439
Merge pull request #3119 from emanuelschuetze/minorFixes
...
Minor fixes
2017-03-22 08:55:14 +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
a4719e68d9
Merge pull request #3117 from emanuelschuetze/fix3079
...
Updated German translations (Fixed #3079 )
2017-03-21 15:09:06 +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