ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,864 Commits 6 Branches 42 Tags 64 MiB
5127d659db
Commit Graph

3989 Commits

Author SHA1 Message Date
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
Norman Jäckel
21b652ec74
Merge pull request #3496 from FinnStutzenstein/UserRegisterForm 
Added presence view
 2017-11-30 21:48:44 +01:00
Norman Jäckel
af2af7e6d2
Merge pull request #3500 from FinnStutzenstein/motionSorting 
Fixed sorting
 2017-11-30 21:45:30 +01:00
Norman Jäckel
05e747cd48
Merge pull request #3502 from FinnStutzenstein/fullscreenCountdown 
Countdown in a fullscreen view
 2017-11-30 21:31:42 +01:00
FinnStutzenstein
6e4fae522b CountdownView 2017-11-28 13:54:23 +01:00
FinnStutzenstein
513f2a887f Use native twisted for daphne 2017-11-28 11:06:39 +01:00
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
FinnStutzenstein
3f0f98dc24 Added presence view 2017-11-24 13:29:33 +01:00
FinnStutzenstein
af96239b9a Fixed sorting 2017-11-24 12:07:21 +01:00
Norman Jäckel
3161bdaa05
Merge pull request #3498 from FinnStutzenstein/MotionHref 
Give motions by id in state and recommendation.
 2017-11-21 20:41:47 +01:00
Norman Jäckel
44b0f14f65
Merge pull request #3494 from FinnStutzenstein/Exportdialog 
Extended exportdialog
 2017-11-21 20:33:37 +01:00
FinnStutzenstein
2bdaf85b67 Give motions by id in state and recommendation. 2017-11-21 16:56:52 +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
ec4873a30c
Merge pull request #3480 from FinnStutzenstein/mediafilesPagination 
Added pagination for mediafiles (fixes #3448)
 2017-11-15 12:28:41 +01:00
FinnStutzenstein
446cab3b44 Added pagination for mediafiles (fixes #3448) 2017-11-15 12:14:18 +01:00
Emanuel Schütze
de47da646b
Merge pull request #3492 from emanuelschuetze/templateImprovements 
Template improvements for motions and projector
 2017-11-15 12:08:24 +01:00
Emanuel Schütze
b515e68068
Merge pull request #3483 from emanuelschuetze/issue3427 
Adds elements to restricted data cache only if cache already exists
 2017-11-15 12:05:59 +01:00
Emanuel Schütze
279c2ba796 Adds elements to restricted data cache only if cache already exists (hotfix for #3427). 
Prevents corrupt cache if restricted data cache is cleared while runtime.
 2017-11-12 17:39:46 +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
db9e132e08 Fix the motion detail template 2017-11-10 17:27:39 +01:00
FinnStutzenstein
bb322b7793 fixed client site lockout protection (fixed #3467) 2017-11-07 09:57:09 +01:00
Norman Jäckel
9fd0121132
Merge pull request #3476 from emanuelschuetze/motionTitle 
Do not show identifier in motion detail template twice.
 2017-11-03 22:04:32 +01:00
Emanuel Schütze
b76fd2303c Do not show identifier in motion detail template twice. 2017-11-03 17:02:55 +01:00
FinnStutzenstein
3affb27507 Motion block slide layout 2017-11-03 14:52:31 +01:00
FinnStutzenstein
b7da8cf7ec Do not show identifier in motion slide twice 2017-11-03 13:06:51 +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
Emanuel Schütze
3706a36051 Updated German translations. 2017-11-03 09:16:08 +01:00
Tobias Hößl
e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Emanuel Schütze
c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff 
Better handling of inserted paragraphs
 2017-11-02 09:11:28 +01:00
FinnStutzenstein
5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
Tobias Hößl
6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze
a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle 
Show motion identifier in (current) list of speakers
 2017-11-01 10:23:19 +01:00
FinnStutzenstein
39bd6653f0 Show motion identifier in (current) list of speakers 2017-11-01 09:58:22 +01:00
Norman Jäckel
6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2 
try/catch for inconsistent data
 2017-10-29 17:59:18 +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
Norman Jäckel
e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy 
Update state field when following a recommendation
 2017-10-29 17:53:30 +01:00
Norman Jäckel
50bed94249
Merge pull request #3463 from FinnStutzenstein/PdfListstyle 
Implement list styles in pdf (fixes #3338)
 2017-10-29 17:52:59 +01:00
Emanuel Schütze
b50d5e10ee Added '!' as new split separator for better motion diff view. 2017-10-27 14:50:38 +02:00
FinnStutzenstein
78f5d1f516 Implement list styles in pdf (fixes #3338) 2017-10-27 14:35:09 +02:00
FinnStutzenstein
1c508765fa Update state field when following a recommendation 2017-10-27 12:36:31 +02:00
Tobias Hößl
5fd8741fdb try/catch for inconsistent data 2017-10-24 20:06:04 +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
Norman Jäckel
d175e4a200 Merge pull request #3452 from FinnStutzenstein/Plugin 
Added TemplateHooks for the protocol plugin.
 2017-10-19 21:21:49 +02:00
FinnStutzenstein
9c657016e3 Added TemplateHooks for the protocol plugin. 2017-10-18 11:35:22 +02:00
Emanuel Schütze
4ff7d0b7dc Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio 
Disable change ratio detection / Fix marking unchanged dangling line as changed
 2017-10-16 13:05:35 +02:00
Tobias Hößl
e651c124e4 Disable change ratio detection / Fix for marking unchanged line as changed 2017-10-16 12:27:44 +02:00
Emanuel Schütze
5eda3131a8 Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements 
Motion template improvements (Fixed #3303)
 2017-10-16 12:10:00 +02:00
Emanuel Schütze
c02f00da7d Merge pull request #3446 from FinnStutzenstein/Identifier 
New motion identifier behavior
 2017-10-16 12:08:53 +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
Emanuel Schütze
721064700a Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove 
Move comments filter behind motion block filter
 2017-10-13 23:38:45 +02:00
Norman Jäckel
611776d38c Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth 
Limit the reason display width
 2017-10-13 18:35:47 +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
5b9933e930 Move comments filter behind motion block filter 2017-10-13 14:25:31 +02:00
FinnStutzenstein
1da34f744f New motion identifier behavior 2017-10-13 14:06:01 +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
6584c7b035 Limit the reason display width 2017-10-13 11:16:01 +02:00
FinnStutzenstein
256c12af8e Reset Countdown when a speech was ended 2017-10-13 11:13:31 +02:00
Norman Jäckel
3c9ae628e8 Merge pull request #3439 from FinnStutzenstein/PdfInsertFix 
Fixed indention of inserted paragraphes
 2017-10-12 20:29:41 +02:00
Tobias Hößl
a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +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
84e2ec2a29 Updated German translations. 2017-10-05 13:33:32 +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
886d76ff06 Merge pull request #3432 from emanuelschuetze/additionalOptions 
Added new motion configs to hide reason/recommendation on projector.
 2017-10-05 13:29:12 +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
Emanuel Schütze
0a04ee0716 Added new motion configs to hide reason/recommendation on projector. 2017-10-05 12:54:40 +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
FinnStutzenstein
5862e054e3 Naive projector prioritization 2017-09-27 14:46:16 +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
Emanuel Schütze
231a056790 Merge pull request #3418 from FinnStutzenstein/ServeLogos 
Serve Logos
 2017-09-27 10:52:29 +02:00
Emanuel Schütze
0b10933d67 Merge pull request #3417 from FinnStutzenstein/HidePassword 
Hide password in change password view
 2017-09-27 10:52:09 +02:00
FinnStutzenstein
6f33c8a866 Fixing motion comments (fixes #3420) 2017-09-27 09:20:07 +02:00
FinnStutzenstein
841383d414 Serve Logos 2017-09-26 10:56:43 +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
Emanuel Schütze
6f3e2a74f8 Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines 
Line break algorithm should not be distracted by newline characters
 2017-09-21 16:35:14 +02:00
Emanuel Schütze
c68688c2ff Merge pull request #3414 from FinnStutzenstein/Fixes 
Motion comments fix and close open dialogs if a relogin is necessary
 2017-09-21 16:29:32 +02:00
Tobias Hößl
ee37cfed9c Line break algorithm should not be distracted by newline characters 
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
 2017-09-21 16:24:54 +02:00
FinnStutzenstein
a4ae174a94 Fixing motion access permissions 2017-09-21 12:43:07 +02:00
FinnStutzenstein
31708df436 Motion comments fix and close open dialogs if a relogin is necessary 2017-09-20 07:34:57 +02:00
Emanuel Schütze
61f59b962d Merge pull request #3411 from emanuelschuetze/stylistic-remarks 
Fixed two stylistic remarks.
 2017-09-18 11:16:39 +02:00
Emanuel Schütze
e313731c9e Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed 
Inline-Diff when the first word in a paragraph is replaced - fixes #3401
 2017-09-18 11:15:52 +02:00
Tobias Hößl
8650bc0401 Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401 2017-09-18 11:05:00 +02:00
Emanuel Schütze
6f4d122e0f Fixed two stylistic remarks. 2017-09-18 09:40:57 +02:00
Tobias Hößl
da8f825d42 Sort attributes before applying the diff - fixes #3402 2017-09-16 14:06:12 +02:00
Emanuel Schütze
b824e0387c Merge pull request #3390 from ostcar/rewrite_restricted_data 
CollectionElement and Autoupdate cleanups to help mypy
 2017-09-15 12:23:50 +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
Emanuel Schütze
483410fe0c Updated German translations. 2017-09-15 12:08:26 +02:00
Emanuel Schütze
4565e7e4a6 Merge pull request #3400 from FinnStutzenstein/UserAutoupdate 
Autoupdates on user login (fixes #3395, fixes #3392)
 2017-09-15 11:48:35 +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
Emanuel Schütze
83f67b23c9 Merge pull request #3403 from ostcar/optional_restricted_data_cache 
Make RestrictedDataCache optional
 2017-09-15 10:56:22 +02:00
FinnStutzenstein
16abfd0dbf Autoupdates on user login (fixes #3395, fixes #3392) 2017-09-15 10:40:04 +02:00
Oskar Hahn
faf44602cb Make RestrictedDataCache optional 2017-09-15 09:55:21 +02:00
Norman Jäckel
0eccd78b78 Merge pull request #3384 from FinnStutzenstein/SecureMedifiles 
Secure Mediafiles and check view permissions
 2017-09-14 20:31:33 +02:00
FinnStutzenstein
288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
FinnStutzenstein
8adf2a6729 Clear the identifier_number on identifier reset (fixes #3353) 2017-09-08 22:09:25 +02:00
Emanuel Schütze
3a25e87330 Merge pull request #3366 from FinnStutzenstein/Issue3363 
New permission for managing lists of speakers (fixes #3363)
 2017-09-08 22:05:32 +02:00
Emanuel Schütze
62f0f23228 Merge pull request #3393 from FinnStutzenstein/Issue3389 
Pagination for assingment list (fixes #3389)
 2017-09-08 21:57:25 +02:00
FinnStutzenstein
4472734d09 New permission for managing lists of speakers (fixes #3363) 2017-09-08 21:55:42 +02:00
FinnStutzenstein
dc03a67281 Pagination for assingment list (fixes #3389) 2017-09-08 21:45:37 +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
0978cfd5d5 Add restricted_data_cache 
This replaces the startup cache
 2017-09-06 18:06:57 +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
Norman Jäckel
438318d3d0 Merge pull request #3386 from emanuelschuetze/fixReasonInlineEditing 
Fixed inline editing of motion reason.
 2017-09-01 20:41:09 +02:00
Norman Jäckel
fcbe70f742 Merge pull request #3388 from ostcar/fix_3377 
Fix PersonalNoteAccessPermissions for anonymous user
 2017-09-01 20:33:59 +02:00
FinnStutzenstein
ab1f745be2 Secure Mediafiles and check view permissions 2017-09-01 14:29:46 +02:00
Oskar Hahn
24b07da7b4 Fix PersonalNoteAccessPermissions for anonymous user 
fixes: #3377
 2017-08-31 22:00:22 +02:00
Emanuel Schütze
f4ac0dd30d Fixed inline editing of motion reason. 2017-08-30 19:23:52 +02:00
Emanuel Schütze
b806e24f87 Updated German translations. 2017-08-30 17:40:26 +02:00
Emanuel Schütze
97a1431c32 Merge pull request #3372 from FinnStutzenstein/Issue3365 
Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367)
 2017-08-29 11:44:47 +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
FinnStutzenstein
7d333d4f3b Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367) 2017-08-29 11:36:00 +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
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
87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +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
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
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