Commit Graph

5126 Commits

Author SHA1 Message Date
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 bc8a1037a2 Fixed createsettings command 2018-01-26 09:35:49 +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
Tobias Hößl b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Raimund Renkert 55503c4262 Locked bootstrap version (3.3.7). Added myself to AUTHORS. 2018-01-20 11:46:52 +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
Norman Jäckel 541e1edb27
Merge pull request #3518 from FinnStutzenstein/delegateDelete
fixed ValidationError
2018-01-10 19:44:48 +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 e067866ff2
Merge pull request #3523 from emanuelschuetze/release2.2b1
Release2.2b1
2017-12-20 21:29:51 +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 a1beee2402
Merge pull request #3521 from emanuelschuetze/translations
Updated translations for CS, ES, FR, PT, RU.
2017-12-20 21:05:20 +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 0abda3f344
Merge pull request #3517 from emanuelschuetze/translations
Updated German translations.
2017-12-15 10:16:13 +01:00
Emanuel Schütze 177c2a888e Updated German translations. 2017-12-15 09:56:17 +01:00