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

4876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
0f322720a4 Merge pull request #3374 from emanuelschuetze/fix-pdf-error-for-reason 
Fixed pdf generation error for motion reason.
 2017-08-28 21:07:39 +02:00
Norman Jäckel
ffde351718 Merge pull request #3368 from FinnStutzenstein/Issue3364 
Different ckeditor toolbar for inline editing
 2017-08-28 20:59:44 +02:00
Norman Jäckel
1ca829f902 Merge pull request #3361 from FinnStutzenstein/ReasonInlineEditing 
Inline editing for motion reason
 2017-08-28 20:53:28 +02:00
Emanuel Schütze
96d3b4178a Fixed pdf generation error for motion reason. 2017-08-24 19:07:01 +02:00
FinnStutzenstein
efbb68cf55 Different ckeditor toolbar for inline editing 2017-08-24 18:49:54 +02:00
Oskar Hahn
9d1ebac86e Add typing (#3370) 
Add typing
 2017-08-23 20:51:06 +02:00
FinnStutzenstein
0f6d2d431c Inline editing for motion reason 2017-08-23 09:42:10 +02:00
Norman Jäckel
c4fe50b38d Merge pull request #3362 from FinnStutzenstein/ScrollImprovement 
Scroll improvement
 2017-08-18 14:30:43 +02:00
Norman Jäckel
effe42464f Merge pull request #3355 from FinnStutzenstein/Issue3169 
Mediafile fullscreen (fixes #3169)
 2017-08-18 14:26:38 +02:00
Norman Jäckel
acdb66ee36 Merge pull request #3354 from FinnStutzenstein/AssignmentSelectAllFix 
Fixing selecting all of assignments
 2017-08-18 14:25:09 +02:00
Norman Jäckel
8f9d6fcc07 Merge pull request #3359 from FinnStutzenstein/MediafilesLayout 
Fixing layout issues in mediafiles list view
 2017-08-18 14:24:38 +02:00
Norman Jäckel
da0a1f76cd Merge pull request #3357 from FinnStutzenstein/ProjectorHeaderFooter 
Config for projector header and footer
 2017-08-18 14:18:52 +02:00
FinnStutzenstein
94a58afbdf Scroll improvement 2017-08-18 11:55:52 +02:00
FinnStutzenstein
4ec4694f01 Fixing layout issues in mediafiles list view 2017-08-18 08:06:13 +02:00
FinnStutzenstein
07e584ae63 Mediafile fullscreen (fixes #3169) 2017-08-16 14:42:19 +02:00
FinnStutzenstein
c72399ff9b Config for projector header and footer 2017-08-16 14:39:58 +02:00
Emanuel Schütze
14e38861c7 Merge pull request #3342 from FinnStutzenstein/Umlaute 
Fixing strange umlauts when copy text from word
 2017-08-16 14:11:28 +02:00
FinnStutzenstein
0a1432f047 Fixing strage umlauts when copy text from word 2017-08-16 11:49:31 +02:00
Norman Jäckel
40e3958a7d Merge pull request #3351 from FinnStutzenstein/NoSpecialCommentsInConfig 
Exclude special comments in comment field settings; fixing the inline…
 2017-08-16 11:45:28 +02:00
Norman Jäckel
76ff708e0e Merge pull request #3348 from FinnStutzenstein/Issue3344 
Default sorting for users, mediafiles and assignments (fixes #3344)
 2017-08-16 11:44:24 +02:00
Norman Jäckel
0fe7b6bf7d Merge pull request #3337 from FinnStutzenstein/CKEditorImages 
Custom CKEditor plugin for browsing mediafiles
 2017-08-16 11:41:55 +02:00
FinnStutzenstein
b63262c943 Custom CKEditor plugin for browsing mediafiles 2017-08-16 10:15:34 +02:00
Emanuel Schütze
b01513ac60 Merge pull request #3347 from FinnStutzenstein/Issue3343 
Fixing paragraphs in lists when exporting PDF (fixes #3343)
 2017-08-16 10:11:39 +02:00
FinnStutzenstein
c36b756f25 Fixing paragraphs in lists when exporting PDF (fixes #3343) 2017-08-16 09:52:30 +02:00
FinnStutzenstein
1fb9b07c6b Fixing selecting all of assignments 2017-08-16 09:49:07 +02:00
FinnStutzenstein
a365127a1c default sorting for users, mediafiles and assignments (fixes #3344) 2017-08-16 09:13:33 +02:00
FinnStutzenstein
a12440ed2c Exclude special comments in comment field settings; fixing the inline editiing 2017-08-16 09:09:22 +02:00
Emanuel Schütze
f0d840148e Merge pull request #3330 from FinnStutzenstein/PluginDev 
Improvements for plugin integration
 2017-08-14 15:06:14 +02:00
Emanuel Schütze
81f841d5e5 Merge pull request #3310 from emanuelschuetze/new-logo 
Added new logo placeholder for web interface header logo.
 2017-08-14 14:50:07 +02:00
FinnStutzenstein
08c9dda1de Improvements for plugin integration 2017-08-14 14:48:31 +02:00
Emanuel Schütze
32c36996b0 Merge pull request #3345 from FinnStutzenstein/testData 
some changes in the example data plugin
 2017-08-14 10:52:45 +02:00
Emanuel Schütze
298d41def7 Merge pull request #3346 from FinnStutzenstein/Issue3232 
removing obsolete merge-before
 2017-08-14 10:00:57 +02:00
FinnStutzenstein
727d1341e8 some changes in the example data plugin 2017-08-14 09:56:48 +02:00
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