Commit Graph

3859 Commits

Author SHA1 Message Date
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 272552055c
Merge pull request #3686 from emanuelschuetze/resetScrollLevel
Reset scroll level for each new projection.
2018-04-10 13:33:07 +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 7f0386138f Template fixes (fixed #3603, fixed #3601, fixed #3555)
- Fixed agenda import preview (Fixed #3603)
- Show import error only if available; for agenda/motions/users (Fixed #3601)
- Added missing tooltips in detail views (Fixed #3555).
2018-04-09 18:01:05 +02:00
FinnStutzenstein 75e0955a29 Fixed motion slide not showing any diffs 2018-04-06 14:24:52 +02:00
Emanuel Schütze ba579637bd
Merge pull request #3684 from FinnStutzenstein/fixMypy
Fixed mypy for utils/migration.py
2018-04-05 09:02:05 +02:00
FinnStutzenstein 23a7481277 Fixed mypy for utils/migration.py. 2018-04-04 15:47:13 +02:00
Emanuel Schütze 0710af827e
Merge pull request #3600 from ostcar/cache-api
Cache api
2018-04-04 13:41:27 +02:00
Emanuel Schütze f3797601c9
Merge pull request #3578 from jsaalfeld/master
Patch userdetails without redundant declaration of users details
2018-04-04 12:15:34 +02:00
Emanuel Schütze ef90f55472
Merge pull request #3683 from FinnStutzenstein/addFontsToMediafileServeView
Add fonts to the medifile serve view
2018-04-04 12:15:07 +02:00
FinnStutzenstein df531b8747 Add fonts to the medifile serve view 2018-04-04 11:57:40 +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 a12735b49e Updated German translations 2018-03-21 12:43:39 +01:00
Norman Jäckel e66718b5f0
Merge pull request #3650 from FinnStutzenstein/multiple-files
New file upload form (fixes #3510, fixed #3082)
2018-03-19 21:23:41 +01:00
Emanuel Schütze 1dc4e5ef05
Merge pull request #3659 from FinnStutzenstein/agenda-autoupdates
Autoupdates for all children if the item type has changed (fixes #3636).
2018-03-19 16:07:41 +01:00
Emanuel Schütze 58dcb0c3b4
Merge pull request #3657 from CatoTH/Issue3656-Too-Much-Caching-Line-Numbers
Add firstLine to cache definition - fixes #3656
2018-03-19 16:06:48 +01:00
Emanuel Schütze a8aa366b3c
Merge pull request #3661 from FinnStutzenstein/improvements
Fixing translations (fixes #3607, fixes #3604).
2018-03-19 15:34:06 +01:00
FinnStutzenstein 05d740b190 Autoupdates for all children if the item type has changed (fixes #3636). 2018-03-19 15:32:20 +01:00
FinnStutzenstein 052daa2b19 Fixing translations (fixes #3607, fixes #3604). 2018-03-19 15:23:34 +01:00
Emanuel Schütze 288c1cafb9 Fix for creating assignment ballot pdf. 2018-03-19 10:15:23 +01:00
FinnStutzenstein a4d460a8f0 New file upload form (fixes #3510, fixed #3082) 2018-03-18 15:16:02 +01:00
Tobias Hößl 652701e4f3
Add firstLine to cache definition - fixes #3656 2018-03-15 19:34:42 +01:00
Emanuel Schütze 09e74481cb
Merge pull request #3655 from emanuelschuetze/groupSorting
Fix group filtering in users list view
2018-03-15 14:17:38 +01:00
Emanuel Schütze 3b0e32b0a2 Fix group filtering in users list view
Use ":true" for angular filter to exact match for searching id (e.g. '2' not '12').
Order groups by id (only important for big mode with caching).
2018-03-15 14:02:05 +01:00
Emanuel Schütze 972d76cf21
Merge pull request #3644 from CatoTH/Isuue3643-OL-Offsets
OL Offsets - fixes #3643
2018-03-15 12:53:13 +01:00
Emanuel Schütze 78747fad35
Merge pull request #3646 from CatoTH/Issue3645-Goto-Original-View-After-Deleting-Title-CR
Go to original view after deleting the Title CR...
2018-03-15 12:42:06 +01:00
Tobias Hößl 76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +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 b1d5fa21c9
Merge pull request #3652 from emanuelschuetze/numberingCategory
Improved error handling of re-numbering motions of a category.
2018-03-14 18:03:48 +01:00
Emanuel Schütze 79d69068f5 Improved error handling of re-numbering motions of a category. 2018-03-14 17:49:25 +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
Tobias Hößl b2043fa49d
Go to original view after deleting the Title CR, if it is the last one - fixes #3645 2018-03-11 18:28:16 +01:00
Tobias Hößl 611be75d95
Bugfix: Title change recommendations on the projector 2018-03-09 14:34:09 +01:00
Jochen Saalfeld d525f2d7d2
patch userdetails without unnecessary double verification 2018-03-09 07:20:40 +01:00
Emanuel Schütze 3e3b62bc38
Merge pull request #3640 from emanuelschuetze/translations
Updated js translations (DE, ES, CS, FR, PT, RU).
2018-03-08 11:15:11 +01:00
Emanuel Schütze 6a388a5bb5 Updated js translations (DE, ES, CS, FR, PT, RU). 2018-03-08 11:00:58 +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
FinnStutzenstein fce2c5857c Disable the agenda hierachy just for searchning, not for filtering 2018-03-08 09:33:49 +01:00
Emanuel Schütze f3c634e677
Merge pull request #3626 from CatoTH/Title-Change-Recommendations
Change recommendations for motion titles
2018-03-08 09:18:02 +01:00
Tobias Hößl 9f8dce6e34
Change recommendations for titles 2018-03-07 16:36:30 +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
Emanuel Schütze 4e1c7b7497 New admin user group 2018-03-06 11:21:00 +01:00
Emanuel Schütze d073cbbf6f
Merge pull request #3566 from FinnStutzenstein/noCachingFlag
Added --no-template-caching
2018-03-06 10:01:36 +01:00
Norman Jäckel 79700caefb
Merge pull request #3633 from FinnStutzenstein/saml-changes
Changes needed for the saml plugin: It is possible now to hook into t…
2018-03-05 20:43:03 +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 c5906b2dba Changes needed for the saml plugin: It is possible now to hook into the complete usermenu 2018-03-05 14:08:39 +01:00
FinnStutzenstein aacdc29394 Added --no-template-caching 2018-03-05 11:55:15 +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
Norman Jäckel a30a30d72f
Merge pull request #3617 from emanuelschuetze/issue3614
Improved motion import/export (Fix #3614).
2018-03-04 20:59:24 +01:00
Norman Jäckel 15ad9340f4
Merge pull request #3616 from emanuelschuetze/issue3613
Adapt motion csv import example file (Fix #3613).
2018-03-04 20:58:50 +01:00
Emanuel Schütze a733f2edb4 Improved motion import/export (Fix #3614).
- Fix motion import if names of paricipants are sorted by surname.
- Support multiple submitters in motion export csv.
2018-03-01 11:21:23 +01:00
Emanuel Schütze 0899bc5e22 Adapt motion csv import example file (Fix #3613). 2018-03-01 10:22:16 +01:00
Emanuel Schütze c4c9cd9d6e Fixed agenda import with empty duration (fix #3603, fix #3601). 2018-02-28 13:14:33 +01:00
Oskar Hahn 5aa8f6193e Add methods to delete the restricted_data_cache 2018-02-24 18:04:32 +01:00
Oskar Hahn c47d054c67 Activate the restricted_data_cache again.
restricted_data_cache.update_element(...) only adds an element to the cache, when
there are already other elements in the cache. So then add_element is never used,
the cache is never created.
2018-02-24 16:57:18 +01:00
Oskar Hahn 6c3ae7cb4e fix mypy 2018-02-24 16:38:17 +01:00
Emanuel Schütze ce141410f8 Update version to 2.2b3-dev 2018-02-16 22:18:55 +01:00
Emanuel Schütze bb6286b4a5 OpenSlides 2.2b2 2018-02-16 22:18:40 +01:00
Emanuel Schütze 4783c94779 Added missing translations. 2018-02-16 22:06:32 +01:00
Emanuel Schütze 3b48dc6988
Merge pull request #3583 from emanuelschuetze/translations
Updated German translations.
2018-02-16 16:56:01 +01:00
Emanuel Schütze 4067a52dda Updated German translations. 2018-02-16 16:41:55 +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
Emanuel Schütze 8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands
Escape Ampersands - fixes #3563
2018-02-15 08:23: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 df523ce526
Merge pull request #3570 from FinnStutzenstein/markSpeaker
Mark speakers
2018-02-14 10:24:36 +01:00
Tobias Hößl a345815b57 Escape Ampersands - fixes #3563 2018-02-13 16:43:07 +01:00
Emanuel Schütze bdd65d90b8 Fix regression of #3573. Refactor the code. 2018-02-13 10:45:00 +01:00
FinnStutzenstein 5fc7dce567 Mark speakers 2018-02-13 10:32:31 +01:00
Emanuel Schütze a6cdb75093
Merge pull request #3564 from FinnStutzenstein/improvements
Fixed email translations, motion sorting, undefined in DOCX, reduced …
2018-02-11 20:12:25 +01:00
Norman Jäckel a18ef1a3fd
Merge pull request #3573 from FinnStutzenstein/pdfListFix
Fixed PDF list
2018-02-11 13:42:28 +01:00
Norman Jäckel 79a96cd6fa
Merge pull request #3571 from FinnStutzenstein/fixMotionDiffCss
Fixed wrong css hierachy
2018-02-11 13:42:01 +01:00
FinnStutzenstein c3bdd78c0e FIxed PDF list 2018-02-09 11:13:14 +01:00
FinnStutzenstein dea62c8394 Fixed wrong css hierachy 2018-02-06 15:53:24 +01:00
FinnStutzenstein 0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
FinnStutzenstein ae18a31e4c Fixed outdated css classes (fixes #3540) 2018-01-30 09:41:49 +01:00
Emanuel Schütze ec2fcbdd73
Merge pull request #3341 from normanjaeckel/BetterAgenda
Supported server side setup of new agenda items (type and parent).
2018-01-29 10:38:50 +01:00
FinnStutzenstein 39e49f7226 Finally removed AgendaAutoupdate 2018-01-29 09:18:15 +01:00
Norman Jäckel 4aad16db4f Enhance setup of new agenda items for topics, motions and motion blocks. 2018-01-29 09:18:07 +01:00
Norman Jäckel 22231e5852
Merge pull request #3560 from FinnStutzenstein/cke-imageplugin-icon-fix
Fixed image plugin icon (fixes #3553)
2018-01-28 14:01:08 +01:00
Emanuel Schütze 9c4a8cc7fc
Merge pull request #3539 from normanjaeckel/BundleAutoupdate
Added autoupdate bundle middleware.
2018-01-26 15:23:32 +01:00
Emanuel Schütze 6957933b12
Merge pull request #3541 from normanjaeckel/CleanupConfig
Cleaned up config app. Removed OPTIONS request. Fixed #3531.
2018-01-26 15:15:01 +01:00
Norman Jäckel 1527cc69dd Cleaned up config app. Removed OPTIONS request. Fixed #3531. 2018-01-26 13:58:21 +01:00
FinnStutzenstein 47730045dd Fixed image plugin icon (fixes #3553) 2018-01-26 10:05:15 +01:00
FinnStutzenstein bc8a1037a2 Fixed createsettings command 2018-01-26 09:35:49 +01:00
FinnStutzenstein f7de741e10 Removed agenda related options from assignment client code 2018-01-25 23:37:23 +01:00
Norman Jäckel 4a78298f94 Supported server side setup of new agenda items (type and parent). 2018-01-25 23:14:26 +01:00
Norman Jäckel d381ca36dd Added autoupdate bundle middleware. 2018-01-25 23:09:28 +01:00
Norman Jäckel b5157cd418
Merge pull request #3550 from emanuelschuetze/defaultpassword
Save default password with createopenslidesuser command.
2018-01-23 20:08:31 +01:00
FinnStutzenstein 60b6ef1415 Repair the master 2018-01-23 14:02:16 +01:00
Emanuel Schütze 47697fe90c Save default password with createopenslidesuser command. 2018-01-23 10:29:11 +01:00
Tobias Hößl c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +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 39c499dc68
Merge pull request #3547 from emanuelschuetze/fix-language-set
Fix regression of #3543: Missing function to set current language.
2018-01-21 11:36:07 +01:00
Emanuel Schütze 2f7bc4227a
Merge pull request #3546 from CatoTH/Bugfix-Diff-Bugfix-Moving-Words
Fixes an edge case in the diff
2018-01-21 10:30:44 +01:00
Tobias Hößl e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +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 3ac072d1a2
Merge pull request #3534 from normanjaeckel/BetterProjectorPrioritization
Split send_data channel into send_data_projector and send_data_site f…
2018-01-21 09:23:19 +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
Tobias Hößl b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Norman Jäckel aaeb85db61 Split send_data channel into send_data_projector and send_data_site for projector prioritization. Fixed #3426. 2018-01-20 11:07:28 +01:00
Finn Stutzenstein cfefd1c7b7
Merge pull request #3507 from FinnStutzenstein/css
split up css classes
2018-01-16 09:41:08 +01:00
FinnStutzenstein cc75452691 split up css classes using sass 2018-01-16 08:38:11 +01:00
Emanuel Schütze 879e9bcbb7
Merge pull request #3529 from FinnStutzenstein/hideIdentifierFieldDelegates
Hide identifier field in motion update form if the user is delegate
2018-01-12 15:44:23 +01:00
Emanuel Schütze 42b82c683b
Merge pull request #3530 from FinnStutzenstein/emailDebugFlag
Email debug flag (fixes #3526)
2018-01-12 15:37:01 +01:00
Emanuel Schütze c6f4a6f162
Merge pull request #3525 from FinnStutzenstein/emailfix
Filter for email and more dialog to the user, if some users have no emails
2018-01-12 15:33:37 +01:00
FinnStutzenstein 9c3260d400 Email debug flag (fixes #3526) 2018-01-12 08:40:15 +01:00
FinnStutzenstein 264b6f7d34 Hide identifier field in motion update form if the user is delegate (fixes #3528) 2018-01-12 08:08:01 +01:00
FinnStutzenstein 453d981d6b Filter for email and more dialog to the user, if some users have no
emails
2018-01-09 15:23:24 +01:00
FinnStutzenstein 5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze e400a115a9 Update version to 2.2b2-dev 2017-12-20 21:18:47 +01:00
Emanuel Schütze 6ffb79f514 Release 2.2b1 2017-12-20 21:17:53 +01:00
Emanuel Schütze 01d396d925 Updated translations for CS, ES, FR, PT, RU. 2017-12-20 20:44:27 +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 3271ff368c
Merge pull request #3516 from FinnStutzenstein/delegateDelete
Allow to delete own motions
2017-12-15 10:41:16 +01:00
FinnStutzenstein a934ab3845 Allow to delete own motions. 2017-12-15 10:20:40 +01:00
Emanuel Schütze 177c2a888e Updated German translations. 2017-12-15 09:56:17 +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 b3a71a741f
Merge pull request #3514 from emanuelschuetze/assignmentHTMLFix
Remove HTML tags from description in assignment PDF.
2017-12-15 09:18:54 +01:00
Emanuel Schütze aad74bdbb4 Remove HTML tags from description in assigment PDF.
Fix usage of clearfix in assignment templates.
2017-12-15 08:49:45 +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
Emanuel Schütze 95be44e7f7 Updated German translations. 2017-12-01 12:07:50 +01:00
Emanuel Schütze a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
2017-12-01 09:34:56 +01:00
FinnStutzenstein b6a2530618 Reduce autoupdates by adding a follow_recommendation view (fixes #3488, fixes #3489) 2017-12-01 09:17:50 +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