Commit Graph

5399 Commits

Author SHA1 Message Date
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
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
Norman Jäckel
e4a18b482b
Merge pull request #3549 from FinnStutzenstein/master-fix
Repair the master
2018-01-23 20:06:28 +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
Emanuel Schütze
172581d557
Merge pull request #3548 from CatoTH/Bugfix-Diff-Inserted-Whitespace-After-BR
Diff-Bugfix: Whitespace was inserted after <br>
2018-01-22 09:26:28 +01:00
Tobias Hößl
c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
Emanuel Schütze
fc4f9d39c1
Merge pull request #3535 from FinnStutzenstein/saml
Preparations for the SAML plugin; Fixed caching of main views.
2018-01-21 12:05:20 +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
3d04594fc7
Merge pull request #3538 from emanuelschuetze/improvements
Improvements
2018-01-20 22:01:10 +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
Emanuel Schütze
ced36d0c0d
Merge pull request #3543 from jsaalfeld/master
save language selection to session storage
2018-01-20 21:19:48 +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
Norman Jäckel
940f0bbd1b
Merge pull request #3537 from CatoTH/Bugfix-Diff-Linebreaks-At-Dashes
Bugfix: Diff and Line breaks at dashes
2018-01-20 12:41:58 +01:00
Norman Jäckel
9615149442
Merge pull request #3536 from rrenkert/master
Locked bootstrap version (3.3.7). Added myself to AUTHORS.
2018-01-20 12:04:09 +01:00