45cac43193
Remove erroneous margin around inline diff paragraphs in PDF
2017-03-22 20:54:56 +01:00
e5028f7ef2
Merge pull request #3127 from emanuelschuetze/issue3112
...
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112 , #3038 )
2017-03-22 15:54:38 +01:00
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
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
bb5394eb36
fix pdf style parsing issue ( fixes #2811 )
2017-03-22 14:57:08 +01:00
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
4dfc337626
Merge pull request #3126 from emanuelschuetze/update-translations-2
...
Updated translations (Fixed #2955 )
2017-03-22 12:58:05 +01:00
b6e1b3fc67
Updated translations ( Fixed #2955 )
2017-03-22 12:52:11 +01:00
c912811bd3
Beginning: passing line numbers through the diff
2017-03-22 12:21:45 +01:00
6b253ef4b7
Merge pull request #3124 from emanuelschuetze/tooltip
...
Fixed hidden tooltip content in motion toolbar.
2017-03-22 10:57:51 +01:00
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
af9559d036
Fixed hidden tooltip content in motion toolbar.
2017-03-22 10:38:22 +01:00
19d16a1ea7
Show username if first and last name is empty ( Fixed #3121 )
2017-03-22 09:13:33 +01:00
ae098b1439
Merge pull request #3119 from emanuelschuetze/minorFixes
...
Minor fixes
2017-03-22 08:55:14 +01:00
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
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
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
70de0a6e4b
Hide change recommendation diff-box in diff version for normal users.
2017-03-21 20:47:58 +01:00
b7d3acc94b
Merge pull request #3114 from emanuelschuetze/assignment-fixes
...
Fixed assignment JS bugs (Fixed #3099 )
2017-03-21 17:28:03 +01:00
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
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
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
0036029709
Fixed double paragraphs in motion pdf which contains links ( Fixed #3095 ).
2017-03-21 16:08:39 +01:00
74811a4529
Allow style attributes for about field in user detail template ( Fixed #3081 )
2017-03-21 15:19:22 +01:00
a4719e68d9
Merge pull request #3117 from emanuelschuetze/fix3079
...
Updated German translations (Fixed #3079 )
2017-03-21 15:09:06 +01:00
bfa8076862
Updated German translations ( Fixed #3079 )
2017-03-21 14:55:14 +01:00
a0531a3268
Fixes Ballot tabs on create/delete ( fixes #3058 )
2017-03-21 14:37:10 +01:00
4f84a9f752
Fixes #3092 , fixes #2453 and fixed motion projection bug
2017-03-21 14:29:06 +01:00
9720de42a1
Merge pull request #3115 from emanuelschuetze/translation-updates
...
Updated translations (EN+DE).
2017-03-21 14:18:50 +01:00
0852c14524
Updated translations (EN+DE).
2017-03-21 14:09:20 +01:00
0082410cc8
Fixed assignment JS bugs ( Fixed #3099 )
2017-03-21 13:57:48 +01:00
08bd1251a7
More speed improvements
2017-03-21 11:08:52 +01:00
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
238b4b7f0a
Improving creation of ballots ( fixes #3103 )
2017-03-21 10:33:36 +01:00
a638b05538
Let users with comments management perms edit them ( fixes #3036 ), fixes #3090
2017-03-21 09:59:49 +01:00
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
b6e978f96a
Merge pull request #3093 from FinnStutzenstein/ProjectorSidebar
...
Fixing the sidebar
2017-03-20 22:07:14 +01:00
a3c7eeb091
Add an explicit line highlighting function for the diff
2017-03-18 15:24:19 +01:00
542cb67d59
Fixing the sidebar, fixes #3068
2017-03-17 12:24:40 +01:00
259e338b17
fix double PDF Head in Motions ( fixes #3025 )
2017-03-16 23:17:25 +01:00
a33f0dd668
Merge pull request #3078 from emanuelschuetze/template-fixes
...
Several template fixes
2017-03-16 14:14:01 +01:00
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
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
1be2cbb8dc
Fixed autoupdate error after deleting a slide ( Fixed #3066 ).
2017-03-09 08:51:57 +01:00
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
365a65ef7c
Merge pull request #3071 from emanuelschuetze/travis
...
Added karma tests for angular.js to travis.
2017-03-09 00:05:06 +01:00
e611b46784
Added karma tests for angular.js to travis.
...
Installed required dependencies to run karma test in phantomjs which
is a supported browser by travis.
2017-03-08 23:46:04 +01:00
780b9e2e9a
Hide empty placeholder of ui-tree in sort templates.
2017-03-08 23:07:22 +01:00
82e20ee5a7
Merge pull request #3073 from emanuelschuetze/fixes
...
Minor template fixes
2017-03-08 23:00:26 +01:00
27bc6a7df4
Merge pull request #3072 from CatoTH/fix-diff-test-cases
...
Fixes broken diff test cases
2017-03-08 22:51:37 +01:00
Tobias Hößl