Commit Graph

5141 Commits

Author SHA1 Message Date
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
Emanuel Schütze
dfafa69381 Merge pull request #3413 from emanuelschuetze/dockerfile-2
Updated Dockerfile to use requirements_big_mode.txt.
2017-09-21 16:10:27 +02:00
Emanuel Schütze
3d9a237963 Merge pull request #3415 from FinnStutzenstein/MotionCommentsFix
Fixing motion access permissions
2017-09-21 15:56:28 +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
e193c8560a Updated Dockerfile to use requirements_big_mode.txt. 2017-09-19 11:47:31 +02:00
Emanuel Schütze
1fafd74dfa Merge pull request #3412 from emanuelschuetze/fix-karma-test
Fixed karma diff test of #3408.
2017-09-18 12:21:14 +02:00
Emanuel Schütze
9f6deb89c1 Fixed karma diff test of #3408. 2017-09-18 12:02:09 +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
Emanuel Schütze
08ce201b42 Merge pull request #3407 from CatoTH/Issue3402-Diff-With-SPAN-Styles
Sort attributes before applying the diff - fixes #3402
2017-09-18 11:07:38 +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
c4a25637d6 Merge pull request #3406 from emanuelschuetze/dockerfile
Updated Dockerfile and yarn.lock.
2017-09-15 15:28:14 +02:00
Emanuel Schütze
08d8b3d7c2 Updated Dockerfile and yarn.lock. 2017-09-15 15:04:31 +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
Emanuel Schütze
c4c3b615df Merge pull request #3405 from emanuelschuetze/translations
Updated German translations.
2017-09-15 12:23:22 +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
Emanuel Schütze
8e15b5dafe Merge pull request #3404 from FinnStutzenstein/Improvements
Goto top link, improved title, stylistic changes, and more
2017-09-15 11:16:46 +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
Emanuel Schütze
7eaa388747 Merge pull request #3356 from FinnStutzenstein/Issue3353
Clear the identifier_number on identifier reset (fixes #3353)
2017-09-08 22:21:45 +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
Norman Jäckel
8e89db5940 Merge pull request #3397 from emanuelschuetze/issue3387
Pin angular-ui-tree to last working version v2.22.5. (Fixed #3387)
2017-09-08 20:00:34 +02:00
Norman Jäckel
544dd4ce13 Merge pull request #3398 from emanuelschuetze/motion-detail-style
Fixed motion detail style issues
2017-09-08 19:43:31 +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
Emanuel Schütze
0eae11c4c2 Pin angular-ui-tree to last working version v2.22.5. (Fixed #3387) 2017-09-08 11:03:17 +02:00
Oskar Hahn
37b2996b6c Merge pull request #3358 from ostcar/restricted_user_cache
Add restricted_data_cache
2017-09-06 18:38:14 +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