Commit Graph

4699 Commits

Author SHA1 Message Date
Norman Jäckel 6559f5508f Merge pull request #3227 from FinnStutzenstein/Issue3206
Fixing PDF in IE11 (fixes #3206, fixes #3217)
2017-04-28 14:13:07 +02:00
FinnStutzenstein 239d56f350 Fixing PDF in IE11 (fixes #3206, fixes #3217) 2017-04-28 13:16:46 +02:00
Emanuel Schütze e3c39031c7 Merge pull request #3225 from normanjaeckel/UpdateNodeModules
Updated package.json and yarn.lock.
2017-04-28 13:10:30 +02:00
Norman Jäckel d1b45e043c Updated package.json and yarn.lock. 2017-04-28 12:52:49 +02:00
Norman Jäckel 7d0ce465f4 Merge pull request #3188 from normanjaeckel/Yarn
Switched from npm to Yarn. Closed #3012.
2017-04-28 12:19:54 +02:00
Emanuel Schütze daaf3b5663 Updated Dockerfile for using yarn. 2017-04-28 11:49:56 +02:00
Norman Jäckel f10465c477 Switched from npm to Yarn. Closed #3012. 2017-04-28 11:49:55 +02:00
Emanuel Schütze c7c7bfca9c Merge pull request #3222 from emanuelschuetze/translations
Updated German translations.
2017-04-27 15:38:10 +02:00
Emanuel Schütze dd99be5e69 Merge pull request #3221 from normanjaeckel/ChangeKeyError
Fixed error for internal function get_model_from_collection_string.
2017-04-27 15:34:39 +02:00
Emanuel Schütze a77a4edb75 Merge pull request #3220 from normanjaeckel/CleanUp
Removed unused lines.
2017-04-27 15:33:42 +02:00
Emanuel Schütze 0cc4b0c578 Updated German translations. 2017-04-27 15:26:35 +02:00
Norman Jäckel 4bdb06bd9b Fixed error for internal function get_model_from_collection_string. 2017-04-27 15:16:07 +02:00
Norman Jäckel 9781c0b73b Removed unused lines. 2017-04-27 15:09:42 +02:00
Emanuel Schütze 941ac8809e Merge pull request #3208 from tsiegleauq/logos-in-pdf
add logos in PDF
2017-04-27 15:08:36 +02:00
Emanuel Schütze 9387f83f8a Merge pull request #3212 from normanjaeckel/Notify
Added notify system.
2017-04-27 15:07:15 +02:00
Emanuel Schütze 11aacc71b6 Merge pull request #3216 from ostcar/early_websocket_open
Open websocket connections immediately
2017-04-27 13:13:00 +02:00
FinnStutzenstein 349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
Emanuel Schütze 7c8bc935f8 Show pdf footer logo. Fixed layout. 2017-04-27 12:58:11 +02:00
FinnStutzenstein fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +02:00
Sean Engelhardt 2b94dc5942 Added configurable header and footer logos for PDF. 2017-04-27 12:58:11 +02:00
Oskar Hahn 74c1cc63dc Open websocket connections immediately
Also made a performance boost to get_model_from_collection_string()
2017-04-27 12:54:16 +02:00
Emanuel Schütze 06adfa0301 Merge pull request #3190 from normanjaeckel/PersonalNote
Added personal notes for motions
2017-04-27 09:32:54 +02:00
Norman Jäckel bd68997a5d Added notify system. 2017-04-27 09:30:02 +02:00
FinnStutzenstein 96899f63cc Personal note (client side) 2017-04-27 09:10:46 +02:00
Norman Jäckel 6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Emanuel Schütze e1a95588e7 Merge pull request #3215 from emanuelschuetze/motionCatalog
Improved motion catalog pdf for one/mutliple motions.
2017-04-24 15:05:37 +02:00
Emanuel Schütze 4cd9d20435 Improved motion catalog pdf for one/mutliple motions. 2017-04-24 14:53:42 +02:00
Emanuel Schütze 459356bf12 Merge pull request #3214 from emanuelschuetze/translations
Updated translation files and German translation.
2017-04-24 10:59:21 +02:00
Emanuel Schütze 9ebf3509c0 Updated translation files and German translation. 2017-04-24 10:44:32 +02:00
Emanuel Schütze b06f10dea8 Merge pull request #3210 from FinnStutzenstein/SpeakerSort
Fixing issue when sorting a new inserted speaker
2017-04-24 09:54:51 +02:00
Emanuel Schütze 31c6b239c1 Merge pull request #3211 from tsiegleauq/issue3205-pdf-align-del
add more distance in PDF for DEL-tags in new lines (fixes #3205)
2017-04-24 09:54:41 +02:00
FinnStutzenstein 7d1b65429e Fixing issue when sorting a new inserted speaker. 2017-04-24 09:45:53 +02:00
Sean Engelhardt 3cb07c97dc Added more distance in motion PDF for DEL-tags in new lines (fixes #3205). 2017-04-24 09:43:18 +02:00
Emanuel Schütze 09840edc0c Merge pull request #3213 from normanjaeckel/Requirements
Updated requirements (channels and asgi-redis).
2017-04-24 09:38:06 +02:00
Norman Jäckel 24e7d42f6f Merge pull request #3207 from FinnStutzenstein/LogoHeader
Configurable projector header
2017-04-21 22:09:18 +02:00
Norman Jäckel 5b5cee0a24 Updated requirements (channels and asgi-redis). 2017-04-20 14:39:20 +02:00
Emanuel Schütze 8c4ec1c218 Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching
Bugfix: changing line length did not invalidate cache
2017-04-19 15:03:48 +02:00
FinnStutzenstein 61058fac49 Configurable projector header image 2017-04-19 14:54:31 +02:00
Tobias Hößl 9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel 8380e97f93 Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks
Add a parameter 'lineBreaks' to getTextByMode
2017-04-19 14:45:24 +02:00
Emanuel Schütze f2e287e4a3 Merge pull request #3201 from emanuelschuetze/fixCSVUserImport
Fixed compare of duplicated users while csv user import.
2017-04-19 13:50:28 +02:00
Emanuel Schütze 3614ba9451 Fixed compare of duplicated users while csv user import. 2017-04-19 13:38:06 +02:00
Emanuel Schütze 146b49c4aa Merge pull request #3199 from FinnStutzenstein/Issue3192
Fix clearing empty chat messages (fixes #3192)
2017-04-19 08:52:26 +02:00
FinnStutzenstein d78a7f91bc Fix clearing empty chat messages (fixes #3192) 2017-04-19 08:00:18 +02:00
Tobias Hößl a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +02:00
Emanuel Schütze b7fdbc88d6 Merge pull request #3200 from normanjaeckel/PasswordValidator
Added support for password validation using Django or custom validato…
2017-04-18 10:14:43 +02:00
Norman Jäckel 21418f632f Added support for password validation using Django or custom validators e. g. for minimum password length. 2017-04-13 16:20:38 +02:00
Emanuel Schütze 7d2785b9ec Merge pull request #3189 from FinnStutzenstein/pdf-zip
Pdf zip
2017-04-13 11:54:19 +02:00
Emanuel Schütze 768cc5f711 Merge pull request #3196 from emanuelschuetze/motionCommentRegression
Fixed regression that opening of motion create form failed.
2017-04-12 20:12:57 +02:00
Emanuel Schütze d9e81a165d Merge pull request #3197 from emanuelschuetze/translations
Fixed translation strings and updated German translations.
2017-04-12 20:11:22 +02:00