ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,678 Commits 6 Branches 42 Tags 64 MiB
35d9fd9d8e
Commit Graph

1039 Commits

Author SHA1 Message Date
Jochen Saalfeld
9e66f05603
adding working privacy policy 
In order to archive GDPR compliance we need a privacy policy.
 2018-05-23 15:13:05 +02:00
FinnStutzenstein
e4735b9437 no negative votes and better scrolling in forms with number inputs (closes #3739) 2018-05-22 14:30:25 +02:00
FinnStutzenstein
5833393268 Messaging docstring and user callback 
only hide votes for unpublished polls
 2018-05-22 09:20:19 +02:00
Emanuel Schütze
682a5eea5a Minor template improvements and fixes 
- Fix back-to-motion-block-link in item detail view.
- Show projector name in window title.
- Fix sorting for motion blocks and categories in motion list view.
- Fix missing permission check for editing motion block.
- Improved style of rejected CR in motionn detail view.
 2018-05-16 17:50:24 +02:00
FinnStutzenstein
ecb76fd888 Throw errors if pdf generation fails, if an image could not be loaded (fixes #3730) 2018-05-16 17:06:42 +02:00
FinnStutzenstein
f1ab2b3afc fixed #3708 2018-05-09 08:48:37 +02:00
FinnStutzenstein
0a141adbd1 Fixes for the item projection (fixes #3733) 2018-05-04 10:27:39 +02:00
Emanuel Schütze
b37bad72ef
Merge pull request #3729 from FinnStutzenstein/pdfImageSize 
Fixed parsing of image sizes
 2018-05-02 13:53:34 +02:00
FinnStutzenstein
06ddd8ee46 Fixed parsing of image sizes 2018-05-02 13:44:35 +02:00
FinnStutzenstein
0224c4287a Fixed stylistic remarks from #3682 (fixes #3709) 2018-05-02 10:13:45 +02:00
Emanuel Schütze
bf27b6f016
Merge pull request #3723 from emanuelschuetze/fixes 
Template improvements
 2018-04-25 16:01:21 +02:00
Emanuel Schütze
ef2a22fefe Template improvements 
- Show item duration and done for normal users correctly.
- Fixed CSS class for countdown warning time.
- Improved projector manage button layout.
- Updated fontawsome icons to 4.7.
- Fixed iframe width/height to show border correctly.
- Improved 'close list of speakers' button.
- Improved 'clear all filter' icons.
- Fixed election pdf if candidate was deleted.
- Moved ban icon for internal icons.
- Improved edit projector form. Show simple scaling steps instead of
  width/height resolution.
- Consolidated both agenda item filters.
- Used better sort icon.
- Installed colordialog plugin for ckeditor to select more colors.
- Several css improvements.
 2018-04-25 15:47:39 +02:00
Emanuel Schütze
8680d4af85
Merge pull request #3722 from FinnStutzenstein/betterProjectorButton 
precalculate projectorchanges in the client
 2018-04-25 14:13:52 +02:00
FinnStutzenstein
08045638ab precalculate projectorchanges in the client 2018-04-25 11:08:23 +02:00
Sean Engelhardt
85e329b9b3 add template hook in user div 2018-04-24 11:53:31 +02:00
FinnStutzenstein
10038b782f One request for each projection. Added some validation for clear_elements and prune_elements 2018-04-24 10:23:28 +02:00
Emanuel Schütze
b6ebc78e85
Merge pull request #3682 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin
 2018-04-13 15:11:48 +02:00
FinnStutzenstein
fa5b81dad8 Protect numbering of the agenda 2018-04-13 10:09:22 +02:00
FinnStutzenstein
094fa4da84 Added pagination on top of lists (Fixed #3667). 2018-04-13 09:51:14 +02:00
FinnStutzenstein
2256031184 Changes for the voting plugin 
- new-style template hooks. See changes in the template hook documentation
- reordered user list view to get more space for extra things
- added template hooks.
 2018-04-11 10:31:48 +02:00
Emanuel Schütze
47dfff2199
Merge pull request #3689 from FinnStutzenstein/scrollToTop 
Scroll to top on every state change
 2018-04-10 13:47:45 +02:00
Emanuel Schütze
15403e9ba3
Merge pull request #3688 from FinnStutzenstein/validateAssignmentDescription 
Validize assignment description, if old-style play intext is in the d…
 2018-04-10 13:46:38 +02:00
FinnStutzenstein
634dd70f90 Scroll to top on every state change 2018-04-10 13:35:33 +02:00
Emanuel Schütze
560e28f19e Reset scroll level for each new projection. 2018-04-10 13:24:34 +02:00
FinnStutzenstein
5b8d11d661 Validize assignment description, if old-style play intext is in the database 2018-04-10 08:14:42 +02:00
Emanuel Schütze
147fa6f370
Merge pull request #3679 from FinnStutzenstein/fixes 
fixed indentions in pdf, remove every tab in html (fixes #3678)
 2018-04-04 11:39:48 +02:00
Emanuel Schütze
4cb9692ad3
Merge pull request #3677 from FinnStutzenstein/pdf-custom-numbering 
Custom numbering in PDF
 2018-04-04 11:27:36 +02:00
FinnStutzenstein
ad5c81a3db fixed indentions and wrong line breaks in pdf, remove every tab in html (fixes #3678) 2018-03-25 11:10:17 +02:00
FinnStutzenstein
249d1c8ddb Custom numbering in PDF 2018-03-23 08:41:18 +01:00
FinnStutzenstein
badd6764aa Fixed pdf export when element is null 2018-03-22 09:34:01 +01:00
Emanuel Schütze
1ac3cb7552
Merge pull request #3641 from FinnStutzenstein/add-perms-during-migrations 
Adding new permission to groups during migration from 2.1.1 to 2.2
 2018-03-15 12:22:28 +01:00
Emanuel Schütze
319f329b5e
Merge pull request #3651 from emanuelschuetze/layoutImprovements 
Layout improvements for agenda and motions
 2018-03-14 17:17:33 +01:00
Emanuel Schütze
bee73d3a28 Layout improvements for agenda and motions 
- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
 2018-03-14 12:06:26 +01:00
FinnStutzenstein
b081401d57 Adding new permission to groups during migration from 2.1.1 to 2.2 2018-03-12 14:11:20 +01:00
FinnStutzenstein
9639d9233f Pdf fixes 2018-03-12 14:00:23 +01:00
Emanuel Schütze
6daf262c0e Some minor CSS improvements. 
- Projector: Use same line height in list elements as in content.
- Projector: Reduce indentation of ul/ol lists.
- Projector: Add more space between line numbers and motion text,
- Agenda list: Remove padding-left in item list view.
 2018-03-08 10:51:31 +01:00
Emanuel Schütze
10bee988af
Merge pull request #3634 from emanuelschuetze/event-name 
Added event name to web interface header.
 2018-03-07 13:12:46 +01:00
Emanuel Schütze
5db632365f Added event name to web interface header. 2018-03-06 12:20:35 +01:00
Norman Jäckel
ec0094827d
Merge pull request #3630 from FinnStutzenstein/fix-deselection 
Fixed delection of logos and fonts. Closes #3606
 2018-03-05 20:42:13 +01:00
FinnStutzenstein
1949a00ee7 Moved image sources to the virtual filesystem 2018-03-05 11:51:35 +01:00
FinnStutzenstein
2269679186 Fixed delection of logos and fonts. Closes #3606 2018-03-05 09:15:40 +01:00
FinnStutzenstein
bbd3aa2ec8 Custom format remover plugin for CKEditor. 2018-02-16 15:38:36 +01:00
Emanuel Schütze
1d49121cb6
Merge pull request #3581 from FinnStutzenstein/li-space 
Add space between list elements in motion text and pdf
 2018-02-16 15:30:48 +01:00
Emanuel Schütze
d22a2c3c58
Merge pull request #3567 from FinnStutzenstein/layoutChanges 
Collapsable agenda, one panel for each motion comment and hide closed…
 2018-02-16 14:55:05 +01:00
FinnStutzenstein
1c62f7510b Add space between list elements in motion text and pdf 2018-02-16 14:54:19 +01:00
FinnStutzenstein
44fcfb447e Collapsable agenda, one panel for each motion comment and hide closed agenda items in the item slide. 2018-02-16 14:30:03 +01:00
Emanuel Schütze
f859a27fca
Merge pull request #3565 from FinnStutzenstein/splitup-comment-perms 
Splitup comment see and manage permissions for motion comments
 2018-02-16 14:26:11 +01:00
FinnStutzenstein
ca8ee3edd6 Splitup comment see and manage permissions for motion comments 2018-02-16 14:09:32 +01:00
FinnStutzenstein
dfb40684ee Custom fonts for pdf and projector 2018-02-16 14:06:54 +01:00
FinnStutzenstein
3ba39c37c1 Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage (fixes #3558). 2018-02-14 10:25:51 +01:00
Emanuel Schütze
bdd65d90b8 Fix regression of #3573. Refactor the code. 2018-02-13 10:45:00 +01:00
Norman Jäckel
a18ef1a3fd
Merge pull request #3573 from FinnStutzenstein/pdfListFix 
Fixed PDF list
 2018-02-11 13:42:28 +01:00
FinnStutzenstein
c3bdd78c0e FIxed PDF list 2018-02-09 11:13:14 +01:00
FinnStutzenstein
ae18a31e4c Fixed outdated css classes (fixes #3540) 2018-01-30 09:41:49 +01:00
Norman Jäckel
1527cc69dd Cleaned up config app. Removed OPTIONS request. Fixed #3531. 2018-01-26 13:58:21 +01:00
FinnStutzenstein
60b6ef1415 Repair the master 2018-01-23 14:02:16 +01:00
FinnStutzenstein
5e089bfcdc Preparations for the SAML plugin; Fixed caching of main views. 2018-01-21 11:54:01 +01:00
Emanuel Schütze
fd709c8203 Fix regression of #3543: Missing function to set current language. 2018-01-21 10:04:50 +01:00
Emanuel Schütze
60fa629857 Set new default for projector resolution (1220x915, Fixed #2549). 2018-01-20 21:20:52 +01:00
Emanuel Schütze
2bd4e9c1f7 Remove unused config field 'event_organizer' (Fixed #804) 2018-01-20 21:20:27 +01:00
Emanuel Schütze
fd324658f5 Added more margin-bottom for h1 on projector (Fixed #3147) 2018-01-20 21:20:27 +01:00
Jochen Saalfeld
612924c087
save language selection to session storage 
and adding @FinnStutzenstein remarks

adding changelog entry
 2018-01-20 20:57:53 +01:00
FinnStutzenstein
cc75452691 split up css classes using sass 2018-01-16 08:38:11 +01:00
Emanuel Schütze
cf95c64f88
Merge pull request #3515 from emanuelschuetze/speakers-overlay-fix 
Fix linebreak after microphone icon in speakers overlay.
 2017-12-15 10:42:16 +01:00
Emanuel Schütze
2fde162357 Fix linebreak after microphone icon in speakers overlay. 2017-12-15 09:21:51 +01:00
Emanuel Schütze
2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest 
Send invitation emails
 2017-12-15 08:29:09 +01:00
FinnStutzenstein
2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
Norman Jäckel
912876c895
Merge pull request #3505 from FinnStutzenstein/legalNotice 
extended the legal notice page (fixes #3504)
 2017-12-11 21:49:00 +01:00
Emanuel Schütze
3d264683ff Assignment improvements 
- Use ckeditor for assignment description field (e.g. for candidatures
  using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
  for candidate rows.
 2017-12-05 14:04:35 +01:00
FinnStutzenstein
a998657923 extended the legal notice page (fixes #3504) 2017-12-05 07:55:12 +01:00
FinnStutzenstein
34ac4a347c Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout 2017-12-01 09:16:48 +01:00
Norman Jäckel
3ac1c3c756
Merge pull request #3495 from FinnStutzenstein/ChangeRecoOther 
New change recommendation type other
 2017-11-30 21:52:17 +01:00
Norman Jäckel
af2af7e6d2
Merge pull request #3500 from FinnStutzenstein/motionSorting 
Fixed sorting
 2017-11-30 21:45:30 +01:00
FinnStutzenstein
6e4fae522b CountdownView 2017-11-28 13:54:23 +01:00
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
FinnStutzenstein
af96239b9a Fixed sorting 2017-11-24 12:07:21 +01:00
Norman Jäckel
44b0f14f65
Merge pull request #3494 from FinnStutzenstein/Exportdialog 
Extended exportdialog
 2017-11-21 20:33:37 +01:00
FinnStutzenstein
79e6e31229 Extended motion export dialog (fixes #3493) 
- Cleanup formfield types
- Remove complete columns in the csv
 2017-11-21 16:27:05 +01:00
Emanuel Schütze
7a3d3d99d6
Merge pull request #3482 from FinnStutzenstein/Improvements 
Some improvements
 2017-11-17 14:55:38 +01:00
FinnStutzenstein
1b1c486c9d Some improvements 2017-11-17 12:14:07 +01:00
Emanuel Schütze
4f9b1e178f
Merge pull request #3481 from FinnStutzenstein/LockoutProtection 
fixed client site lockout protection (fixed #3467)
 2017-11-15 12:37:36 +01:00
Emanuel Schütze
702b452b6e Template improvements for motions and projector 
- Use same title layout for (current) list of speakers slide.
- Set default choose for current list of speakers slide to 'project as slide'
  if more than one projectors available.
- Remove additional control bottons in list of speakers view to stop/end current/next speech.
  (User should better use the start/stop buttons behind the speaker names.)
- Fix typo in projection defaults.
- Set sidebox in motion slide to fix position (should not scroll).
- Fix order of amendments in motion detail template.
- Increase font size of motion block items on slide.
 2017-11-12 17:23:05 +01:00
FinnStutzenstein
bb322b7793 fixed client site lockout protection (fixed #3467) 2017-11-07 09:57:09 +01:00
FinnStutzenstein
3affb27507 Motion block slide layout 2017-11-03 14:52:31 +01:00
Emanuel Schütze
bed42b5c66
Merge pull request #3472 from FinnStutzenstein/templateChanges 
Template changes and IE fix
 2017-11-03 12:55:17 +01:00
FinnStutzenstein
9e46924c77 Template changes and IE fix 
- Fix IE11 that projector shows JS error if 'startsWith' is used.
  Projector was updated very slowly.
- Hide the valid/invalid/casted ballot rows on projector if empty.
- Use 80% width for motion reason in PDF.
 2017-11-03 12:36:03 +01:00
Emanuel Schütze
432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent 
Do not zoom slideheaders
 2017-11-03 12:33:42 +01:00
FinnStutzenstein
323534700c Do not zoom slideheaders 2017-11-03 12:17:29 +01:00
Emanuel Schütze
5558ba3fc6
Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView 
Showing the number of next speakers in motion list view
 2017-11-03 10:55:13 +01:00
Emanuel Schütze
969274faf3
Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector 
hide 'undefined' error message
 2017-11-03 10:47:49 +01:00
Emanuel Schütze
4cbf7d6c9f
Merge pull request #3469 from FinnStutzenstein/CountdownRace 
Bundle autoupdates for beginning a speech
 2017-11-03 10:47:22 +01:00
FinnStutzenstein
1236fee7ee Showing the number of next speakers in motion list view 2017-11-03 10:29:34 +01:00
FinnStutzenstein
834ed77a2c Bundle autoupdates for beginning a speech 2017-11-03 10:27:45 +01:00
FinnStutzenstein
84f755a6e5 hide 'undefined' error message 2017-11-03 10:25:22 +01:00
FinnStutzenstein
5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
Norman Jäckel
452ecfbbd0
Merge pull request #3454 from FinnStutzenstein/UserFormFix 
Fixed user form for groups with ids greater than 9
 2017-10-29 17:57:18 +01:00
FinnStutzenstein
78f5d1f516 Implement list styles in pdf (fixes #3338) 2017-10-27 14:35:09 +02:00
FinnStutzenstein
f479a7a1ab Fixed user form for groups with ids greater than 9 2017-10-24 10:23:49 +02:00
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
Norman Jäckel
487b286b79 Merge pull request #3436 from FinnStutzenstein/Remarks 
Fixed all remarks
 2017-10-13 18:20:45 +02:00
FinnStutzenstein
5f45e2d748 Fixed all remarks 2017-10-13 12:02:23 +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
18d138ebf1 Merge pull request #3433 from emanuelschuetze/layoutIssues 
Fixed minor layout issues on projector and pdf.
 2017-10-05 13:29:38 +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
46364a84e1 Generate webclient-realm.js while collecting staticfiles (fixes #3422) 2017-10-04 12:26:30 +02:00
Emanuel Schütze
de9c54513d Merge pull request #3430 from FinnStutzenstein/AgendaFix 
Fixed projecting subitems
 2017-09-28 11:40:47 +02:00
FinnStutzenstein
343ddf5ac5 Fixed projecting subitems 2017-09-28 11:33:33 +02:00
FinnStutzenstein
2ba1fe2a0f Instructions for using Nginx in big mode 2017-09-28 09:35:05 +02:00
Emanuel Schütze
c269ae5cf8 Merge pull request #3419 from FinnStutzenstein/ViewCaching 
Index and Webclient View caching
 2017-09-27 13:21:46 +02:00
FinnStutzenstein
178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +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
Oskar Hahn
d7db714562 CollectionElement and Autoupdate cleanups 
* change get_restricted_data and get_projector_data to always use a list
* Add typings to all get_restricted_data and get_projector_data methods
* Replace CollectionElementList with a real list
* Fixed arguments of inform_deleted_data
* Moved CollectionElementCache to cache.py and refactored it
* Run tests with cache enabled (using fakeredis)
 2017-09-15 12:11:32 +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
Oskar Hahn
71e154ec6d Merge pull request #3382 from ostcar/remove_dispatch 
Rewrite projector_element without dispatch
 2017-09-06 18:06:39 +02:00
Oskar Hahn
b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +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
Emanuel Schütze
b416786b40 Merge pull request #3360 from FinnStutzenstein/PinPersonalNote 
Pin personal note.
 2017-09-05 09:52:31 +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
Oskar Hahn
be94e97889 more typings 2017-09-03 18:34:55 +02:00
Emanuel Schütze
0dda74b99b Merge pull request #3375 from emanuelschuetze/ckeditor 
Updated to ckeditor 4.7.2
 2017-08-29 11:36:58 +02:00
Emanuel Schütze
7d6e1f1b97 Merge pull request #3371 from ostcar/new_config 
Rewrite config to have id field
 2017-08-29 11:31:43 +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
Oskar Hahn
87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +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
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