Commit Graph

5143 Commits

Author SHA1 Message Date
FinnStutzenstein
52e2d2ca83 removing obsolete merge-before (fixes #3232) 2017-08-14 09:51:20 +02:00
Norman Jäckel
e2a32e403d Merge pull request #3349 from FinnStutzenstein/ColorInPdf
Fixing wrong styles in PDF
2017-08-12 13:48:08 +02:00
Norman Jäckel
0c8bf5c5ba Merge pull request #3336 from normanjaeckel/RemoveElementsProjector
Unproject elements when they are deleted. Fixed #3292.
2017-08-12 13:35:09 +02:00
Norman Jäckel
305356f75f Unproject elements when they are deleted. Fixed #3292. 2017-08-12 13:27:23 +02:00
Norman Jäckel
c8e56b29a6 Merge pull request #3340 from CatoTH/Issue3339-Allow-OL-start-tag
Allow OL[start] - fixes #3339
2017-08-12 13:19:46 +02:00
Emanuel Schütze
2c43bfee47 Rework on ballot paper layout for using logos. 2017-08-11 12:50:49 +02:00
FinnStutzenstein
bf56067d17 poll and ballot paper logos 2017-08-11 12:48:48 +02:00
Emanuel Schütze
3e1c1abe14 Added new logo placeholder for web interface header logo. 2017-08-11 12:48:48 +02:00
FinnStutzenstein
5d902d809f Fixing wrong stlyes in PDF 2017-08-11 10:34:03 +02:00
Tobias Hößl
54e067d9d9 Allow OL[start] - fixes #3339
Style
2017-08-02 21:27:12 +02:00
Norman Jäckel
2aeaf251a2 Merge pull request #3335 from emanuelschuetze/config-order
Reorder weight fields of core configs.
2017-07-28 14:53:53 +02:00
Emanuel Schütze
0cb4243891 Merge pull request #3334 from emanuelschuetze/motion-fixes
Motion formatting and sort fixes
2017-07-28 14:36:22 +02:00
Emanuel Schütze
5ee0219702 Reorder weight fields of core configs. 2017-07-28 14:31:59 +02:00
Emanuel Schütze
96be75fc0d Motion formatting and sort fixes
- Adapt font size of outside linenumbers in motion pdf, depending on
  selected standard font size.
- Enlarge width of first column in of meta table of motion pdf.
- Fixed order issue in motion list: Sort always by identifier (also
  after selecting a custom sort parameter).
2017-07-28 14:26:28 +02:00
Emanuel Schütze
c5c15d26b5 Merge pull request #3333 from emanuelschuetze/translations
Updated German translations.
2017-07-27 15:24:16 +02:00
Emanuel Schütze
6b291726a4 Updated German translations. 2017-07-27 15:17:40 +02:00
Emanuel Schütze
2dc7db2b8c Merge pull request #3288 from CatoTH/Issue3269-Issue3232-Split-Elements2
Issue3269 issue3232 split elements2
2017-07-27 15:12:44 +02:00
Emanuel Schütze
3c9a67d084 Merge pull request #3332 from emanuelschuetze/fontsize
Added config option for standard font size in PDF.
2017-07-27 15:04:01 +02:00
Tobias Hößl
7b62c60350 Marks split list items with CSS-classes and hides the bullet points - fixes #3269 2017-07-27 14:42:51 +02:00
Emanuel Schütze
d57d3efcf4 Added config option for standard font size in PDF. 2017-07-27 14:36:49 +02:00
Emanuel Schütze
3c747c01e2 Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export
Hide special comments in export
2017-07-27 14:36:04 +02:00
Emanuel Schütze
7f20a7d358 Merge pull request #3324 from FinnStutzenstein/configvalue-for-id
Configvalue for sequential number
2017-07-27 13:45:19 +02:00
FinnStutzenstein
2e2d28288a Hide special comments in export 2017-07-27 12:44:13 +02:00
FinnStutzenstein
c65976715e configvalue for sequential number 2017-07-27 11:15:12 +02:00
Emanuel Schütze
9dca7fa3b6 Merge pull request #3327 from FinnStutzenstein/configvalue-pdf-pagenumber-alignment
Configvalue for pagenumber alignment in PDF
2017-07-27 11:02:15 +02:00
FinnStutzenstein
1f59336e3e Configvalue for pagenumber alignment in PDF 2017-07-27 10:55:40 +02:00
Emanuel Schütze
41ab706939 Merge pull request #3323 from FinnStutzenstein/hide-error-on-load
Delay the projector not loaded error.
2017-07-27 10:51:18 +02:00
Norman Jäckel
f806dc4017 Merge pull request #3329 from FinnStutzenstein/category-sort-in-export
Add the option to sort the categories different in the motion export
2017-07-27 10:41:02 +02:00
FinnStutzenstein
8560509ace Delay the projector not loaded error. 2017-07-27 10:06:11 +02:00
Emanuel Schütze
c0bd367342 Merge pull request #3328 from FinnStutzenstein/mediafile-type-fix
Fixing mediafiles list view for medifiles without a type
2017-07-27 09:54:30 +02:00
FinnStutzenstein
a32b046fa5 Add the option to sort categories different in motion export. 2017-07-27 09:50:03 +02:00
FinnStutzenstein
6c5cc799ca Fixing mediafiles list view for medifiles without a type 2017-07-26 15:46:14 +02:00
Emanuel Schütze
5644e99b43 Merge pull request #3319 from FinnStutzenstein/docx-text-missing
fixing docx parser missing text
2017-07-26 15:03:27 +02:00
Emanuel Schütze
a44b84e836 Merge pull request #3318 from normanjaeckel/CategorySortError
Fixed error on category numbering. Fixed #3315.
2017-07-26 14:41:27 +02:00
Emanuel Schütze
c58f3071f2 Merge pull request #3321 from FinnStutzenstein/docx-comments-filter
fixing wrong entered comments
2017-07-26 14:33:04 +02:00
FinnStutzenstein
9c0a10df63 fixing wrong entered comments 2017-07-20 14:43:58 +02:00
FinnStutzenstein
615327f64d fixing docx parser missing text 2017-07-19 13:08:31 +02:00
Emanuel Schütze
9c1d2319ac Merge pull request #3317 from normanjaeckel/Changelog
Updated CHANGELOG.
2017-07-07 11:28:34 +02:00
Norman Jäckel
41a70f40df Fixed error on category numbering. Fixed #3315. 2017-07-05 22:13:54 +02:00
Norman Jäckel
e2d710a84c Updated CHANGELOG. 2017-07-05 21:30:16 +02:00
Norman Jäckel
77a321894b Merge pull request #3306 from FinnStutzenstein/Issue2862
Remove OPTION request to query permissions (fixes #2862)
2017-07-05 21:26:08 +02:00
Emanuel Schütze
3006cb388f Merge pull request #3304 from CatoTH/Issue3298-PreventCollidingChangeRecommendations
Prevent colliding change recommendations - fixes #3298
2017-06-29 18:18:36 +02:00
Tobias Hößl
65d5bbccd6 Prevent colliding change recommendations - fixes #3298 2017-06-29 18:03:58 +02:00
FinnStutzenstein
90af3e6d1d remove OPTION request to query permissions (fixes #2862) 2017-06-29 13:25:52 +02:00
Norman Jäckel
1701fd72f2 Merge pull request #3314 from FinnStutzenstein/Bugfixes
Minor Bugfixes (fixes #3312, fixes #3313)
2017-06-29 10:45:13 +02:00
FinnStutzenstein
37eec7d99b Minor Bugfixes (fixes #3312, fixes #3313) 2017-06-29 08:59:41 +02:00
Emanuel Schütze
574d815397 Merge pull request #3311 from FinnStutzenstein/projector-size
Projectorsize selection with slider
2017-06-28 12:43:42 +02:00
FinnStutzenstein
2d35b9e371 Projectorsize selection with slider 2017-06-28 09:23:40 +02:00
Emanuel Schütze
b1d98ca33a Merge pull request #3308 from FinnStutzenstein/agenda-project
call the own project method from a content object of an agenda item
2017-06-27 12:53:02 +02:00
Norman Jäckel
029366de5f Merge pull request #3301 from FinnStutzenstein/related-projected
Highlight objects in list view, if related objects are projected
2017-06-21 22:56:15 +02:00