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

737 Commits

Author SHA1 Message Date
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
298d41def7 Merge pull request #3346 from FinnStutzenstein/Issue3232 
removing obsolete merge-before
 2017-08-14 10:00:57 +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
305356f75f Unproject elements when they are deleted. Fixed #3292. 2017-08-12 13:27:23 +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
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
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
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
FinnStutzenstein
c65976715e configvalue for sequential number 2017-07-27 11:15:12 +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
FinnStutzenstein
8560509ace Delay the projector not loaded error. 2017-07-27 10:06:11 +02:00
FinnStutzenstein
615327f64d fixing docx parser missing text 2017-07-19 13:08:31 +02:00
FinnStutzenstein
2d35b9e371 Projectorsize selection with slider 2017-06-28 09:23:40 +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
Norman Jäckel
e72af0101c Merge pull request #3309 from FinnStutzenstein/Issue3307 
fix not supported 'startsWith' function in IE11 (fixes #3307)
 2017-06-21 21:45:15 +02:00
FinnStutzenstein
f42b6f0d37 fix not supported 'startsWith' function in IE11 (fixes #3307) 2017-06-21 15:28:43 +02:00
FinnStutzenstein
0a1ea46b8d fix projector reconnecting if websocket is closed 2017-06-21 13:18:06 +02:00
FinnStutzenstein
2536b35c0e Highlight objects in list view, if related objects are projected 2017-06-21 07:52:10 +02:00
Emanuel Schütze
bef986630e Merge pull request #3297 from FinnStutzenstein/Issue3295 
improved reconnect handling if the server was flushed (fixed #3295)
 2017-06-16 07:56:30 +02:00
FinnStutzenstein
4387a56fb1 Improved reconnect handling if the server was flushed (fixed #3295). 
just ping with whoami request
 2017-06-16 07:47:17 +02:00
FinnStutzenstein
2e898275cb Some small changes and bugfixes 2017-06-15 14:25:55 +02:00
Emanuel Schütze
fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda 
Fixes autoupdate bug for a user without user.can_see_name permission …
 2017-06-07 21:00:12 +02:00
Norman Jäckel
ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
FinnStutzenstein
9448beb903 Fixes some PDF issues 2017-06-07 07:55:49 +02:00
Emanuel Schütze
074559ba23 Merge pull request #3279 from FinnStutzenstein/Issue3273 
Fixing linenumbers on page break (fixes #3273)
 2017-06-01 15:31:36 +02:00
FinnStutzenstein
a83cd5b947 Fixing linenumbers on page break (fixes #3273) 2017-06-01 15:22:52 +02:00
FinnStutzenstein
678a56db08 Do not reload all projector elements on every autoupdate (fixes #3259). 2017-06-01 15:01:24 +02:00
Emanuel Schütze
b48c850e79 Removed empty <span> tags in ckeditor. 2017-05-31 21:35:32 +02:00
FinnStutzenstein
8cd22daff3 Fixed missing styles of headings in motion pdf. 
Also some refactoring/clean up of pdf code.
 2017-05-29 13:03:12 +02:00
Emanuel Schütze
1b6dd93e6e Merge pull request #3268 from emanuelschuetze/pdf-issue 
Fixed formatting errors in motion pdf (Fixed #3228).
 2017-05-23 22:52:31 +02:00
Emanuel Schütze
eee0e0fc06 Fixed formatting errors in motion pdf (Fixed #3228). 
for diff view
 2017-05-23 22:42:14 +02:00
Norman Jäckel
913bec3e53 Renamed is_user_data_required to required_users. Fixed #3238. 2017-05-22 16:08:52 +02:00
Emanuel Schütze
8abfe91853 Merge pull request #3258 from FinnStutzenstein/docx 
Rework docx parser, add comments to docx
 2017-05-19 14:02:29 +02:00
FinnStutzenstein
f4c4f2553b Rework docx parser, add comments to docx 2017-05-19 13:55:09 +02:00
FinnStutzenstein
e396347e00 Also notify users when they inline edit a motion (fixes #2360) 2017-05-19 13:21:19 +02:00
Emanuel Schütze
3b2c7634f0 Merge pull request #3256 from FinnStutzenstein/Issue3243 
extending the color parser (fixes #3243)
 2017-05-19 08:46:32 +02:00
Norman Jäckel
94aceeffab Merge pull request #3237 from tsiegleauq/issue3180-scale-images 
enables pdf image scaling for CKEditor
 2017-05-18 21:34:06 +02:00
FinnStutzenstein
a23e263dcb extending the color parser (fixes #3243) 2017-05-17 09:13:10 +02:00