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

5172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d185e05ab1
Merge pull request #3584 from emanuelschuetze/release2.2b2 
Release2.2b2
 2018-02-16 22:32:24 +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
471c6ef990
Merge pull request #3585 from emanuelschuetze/translations2 
Added missing translations.
 2018-02-16 22:15:34 +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
Emanuel Schütze
252c19b8ee
Merge pull request #3576 from FinnStutzenstein/ckeditor-remove-markup 
Custom format remover plugin for CKEditor.
 2018-02-16 16:39:06 +01:00
Emanuel Schütze
99e7182cfb
Merge pull request #3579 from jsaalfeld/update_requirements 
Updating requirements and locking versions
 2018-02-16 15:42:42 +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
Jochen Saalfeld
096587f59c
Updating requirements and locking versions 
Locking the versions of channels and daphne, because it would break
OpenSlides otherwise
 2018-02-16 14:38:50 +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
Emanuel Schütze
9458ac8161
Merge pull request #3568 from FinnStutzenstein/fonts 
Custom fonts for pdf and projector
 2018-02-16 14:23:39 +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
Emanuel Schütze
2a1b0a645a
Merge pull request #3569 from FinnStutzenstein/dgb-1 
Agenda DOCX export, motion log message when comment edited, motion se…
 2018-02-14 11:07:20 +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
Norman Jäckel
6c418bb850
Merge pull request #3575 from emanuelschuetze/fix3573 
Fix regression of #3573.
 2018-02-13 22:15:50 +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
3ddc73b0a0
Merge pull request #3562 from CatoTH/Issue3512-LinebreaksInPdfGeneration 
Don't show BR-tags in PDF when line number mode is set to none - fixes #3512
 2018-02-11 20:13:48 +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
Norman Jäckel
318ff7eff6
Merge pull request #3561 from FinnStutzenstein/agenda-css 
Fixed outdated css classes (fixes #3540)
 2018-02-10 11:24:15 +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
Tobias Hößl
77ec2e00b1 Don't show BR-tags in PDF when line number mode is set to none 2018-01-30 11:25:43 +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
Emanuel Schütze
8e1ca4ac69
Merge pull request #3559 from FinnStutzenstein/fix-createsettings 
Fixed createsettings command
 2018-01-26 15:14:19 +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