Commit Graph

653 Commits

Author SHA1 Message Date
Norman Jäckel 73407133bd Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange
Go to top on a page change
2017-10-22 15:35:12 +02:00
Emanuel Schütze 17959bd9c5 Motion template improvements (Fixed #3303)
- Sort categories drop downs by config value (name or prefix) (fixed #3303).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
2017-10-16 09:35:06 +02:00
Norman Jäckel cd2316652d Merge pull request #3443 from FinnStutzenstein/ResetCountdown
Reset Countdown when a speech was ended
2017-10-13 18:23:34 +02:00
Norman Jäckel 9b64bd5646 Merge pull request #3438 from FinnStutzenstein/PDF
Fixing multiline headers in PDF
2017-10-13 18:21:34 +02:00
FinnStutzenstein 96cd3405aa Go to top on a page change 2017-10-13 11:46:41 +02:00
FinnStutzenstein 256c12af8e Reset Countdown when a speech was ended 2017-10-13 11:13:31 +02:00
FinnStutzenstein fc185e2eeb Fixing multiline headers in PDF 2017-10-11 14:21:35 +02:00
FinnStutzenstein b8e23e6a4f Fixed indention of inserted paragraphes 2017-10-11 14:04:31 +02:00
Emanuel Schütze 02857bdbf1 Fixed minor layout issues on projector and pdf.
Especially for motion diff view.
2017-10-05 13:05:49 +02:00
FinnStutzenstein 343ddf5ac5 Fixed projecting subitems 2017-09-28 11:33:33 +02:00
FinnStutzenstein ab08708ec1 Hide password in change password view 2017-09-26 09:03:05 +02:00
FinnStutzenstein aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
FinnStutzenstein 31708df436 Motion comments fix and close open dialogs if a relogin is necessary 2017-09-20 07:34:57 +02:00
FinnStutzenstein c580ee4c8d Goto top link, improved title, stylistic changes, and more 2017-09-15 11:06:19 +02:00
Emanuel Schütze 2c4a1d5a6c Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework
Rework on motion comments.
2017-09-15 10:59:02 +02:00
FinnStutzenstein 288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
Emanuel Schütze 29f60fc6aa Fixed motion detail style issues
- margin in motion diff view
- personal note box
2017-09-08 18:25:48 +02:00
Emanuel Schütze 1e1e7637f9 Merge pull request #3379 from FinnStutzenstein/AgentaTitle
New layout for agenda list slide, fixing long titles in agenda list v…
2017-09-08 15:16:52 +02:00
Norman Jäckel c9ad15621c Merge pull request #3383 from FinnStutzenstein/CustomTranslations
Custom Translations
2017-09-05 22:15:21 +02:00
FinnStutzenstein b35ea2ea5b New layout for agenda list slide, fixing long titles in agenda list view, fixing mediafiles in fullscreen (fixes #3369) 2017-09-05 15:30:59 +02:00
FinnStutzenstein 02428eb8f0 Pin personal note. 2017-09-05 08:24:16 +02:00
FinnStutzenstein b30919eada Custom Translations 2017-09-05 08:04:02 +02:00
Emanuel Schütze e2e6c8c4b4 Updated to ckeditor 4.7.2 2017-08-29 11:26:18 +02:00
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
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
Norman Jäckel c4fe50b38d Merge pull request #3362 from FinnStutzenstein/ScrollImprovement
Scroll improvement
2017-08-18 14:30:43 +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
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 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 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
FinnStutzenstein c36b756f25 Fixing paragraphs in lists when exporting PDF (fixes #3343) 2017-08-16 09:52:30 +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 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
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 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
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 eee0e0fc06 Fixed formatting errors in motion pdf (Fixed #3228).
for diff view
2017-05-23 22:42:14 +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
FinnStutzenstein 91882f1d13 Improve zip creation and fixing page numbers 2017-05-17 07:54:35 +02:00
Emanuel Schütze f46ad742e3 Merge pull request #3230 from FinnStutzenstein/Issue3219
Cleanup MotionUpdateCtrl (fixes #3219)
2017-05-15 14:17:55 +02:00
sean eb259dc5e2 enables pdf image scaling for CKEditor 2017-05-10 13:50:52 +02:00
sean 37b96bb0bc fix long lines in pdf list (fixes #3231) 2017-05-07 22:01:50 +02:00
FinnStutzenstein 118cff6964 Fixing wrong err call 2017-05-05 17:25:34 +02:00
FinnStutzenstein adb5185fcc Cleanup MotionUpdateCtrl (fixes #3219) 2017-04-28 14:18:29 +02:00
FinnStutzenstein 239d56f350 Fixing PDF in IE11 (fixes #3206, fixes #3217) 2017-04-28 13:16:46 +02:00
Emanuel Schütze 941ac8809e Merge pull request #3208 from tsiegleauq/logos-in-pdf
add logos in PDF
2017-04-27 15:08:36 +02:00
FinnStutzenstein 349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
Emanuel Schütze 7c8bc935f8 Show pdf footer logo. Fixed layout. 2017-04-27 12:58:11 +02:00
FinnStutzenstein fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +02:00
Sean Engelhardt 2b94dc5942 Added configurable header and footer logos for PDF. 2017-04-27 12:58:11 +02:00
Norman Jäckel bd68997a5d Added notify system. 2017-04-27 09:30:02 +02:00
Emanuel Schütze 9ebf3509c0 Updated translation files and German translation. 2017-04-24 10:44:32 +02:00
Sean Engelhardt 3cb07c97dc Added more distance in motion PDF for DEL-tags in new lines (fixes #3205). 2017-04-24 09:43:18 +02:00
FinnStutzenstein 61058fac49 Configurable projector header image 2017-04-19 14:54:31 +02:00
FinnStutzenstein 845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze 6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert
Add local convert to Base64 (Fixes #2705)
2017-04-12 15:09:43 +02:00
Sean Engelhardt 65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
FinnStutzenstein 6c932aa77a Support logos 2017-04-12 14:28:46 +02:00