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

5266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
02857bdbf1 Fixed minor layout issues on projector and pdf. 
Especially for motion diff view.
 2017-10-05 13:05:49 +02:00
Emanuel Schütze
0a04ee0716 Added new motion configs to hide reason/recommendation on projector. 2017-10-05 12:54:40 +02:00
Emanuel Schütze
188f29a6c3 Merge pull request #3424 from FinnStutzenstein/Issue3422 
Generate webclient-realm.js while collecting staticfiles (fixes #3422)
 2017-10-05 12:53:28 +02:00
FinnStutzenstein
46364a84e1 Generate webclient-realm.js while collecting staticfiles (fixes #3422) 2017-10-04 12:26:30 +02:00
Norman Jäckel
3840c0ac5e Merge pull request #3431 from FinnStutzenstein/NginxInstructions 
Updated Nginx configuration
 2017-10-03 21:14:52 +02:00
FinnStutzenstein
00296a802b Updated Nginx configuration 2017-09-28 12:19:32 +02:00
Emanuel Schütze
de9c54513d Merge pull request #3430 from FinnStutzenstein/AgendaFix 
Fixed projecting subitems
 2017-09-28 11:40:47 +02:00
FinnStutzenstein
343ddf5ac5 Fixed projecting subitems 2017-09-28 11:33:33 +02:00
Emanuel Schütze
6d791c7828 Merge pull request #3429 from FinnStutzenstein/NginxInstructions 
Instructions for using Nginx in big mode
 2017-09-28 11:29:12 +02:00
FinnStutzenstein
2ba1fe2a0f Instructions for using Nginx in big mode 2017-09-28 09:35:05 +02:00
Emanuel Schütze
4c9a8b4ec7 Merge pull request #3425 from FinnStutzenstein/ProjectorPrio 
Naive projector prioritization
 2017-09-27 15:23:24 +02:00
FinnStutzenstein
5862e054e3 Naive projector prioritization 2017-09-27 14:46:16 +02:00
Emanuel Schütze
c269ae5cf8 Merge pull request #3419 from FinnStutzenstein/ViewCaching 
Index and Webclient View caching
 2017-09-27 13:21:46 +02:00
FinnStutzenstein
178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +02:00
Emanuel Schütze
863e929470 Merge pull request #3423 from emanuelschuetze/dockerfile 
Install vim in Dockerimage.
 2017-09-27 12:12:48 +02:00
Emanuel Schütze
e3e8785079 Install vim in Dockerimage. 2017-09-27 11:12:00 +02:00
Emanuel Schütze
231a056790 Merge pull request #3418 from FinnStutzenstein/ServeLogos 
Serve Logos
 2017-09-27 10:52:29 +02:00
Emanuel Schütze
0b10933d67 Merge pull request #3417 from FinnStutzenstein/HidePassword 
Hide password in change password view
 2017-09-27 10:52:09 +02:00
Emanuel Schütze
456d1ff763 Merge pull request #3421 from FinnStutzenstein/MotionCommentsFix3 
Fixing motion comments
 2017-09-27 09:35:11 +02:00
FinnStutzenstein
6f33c8a866 Fixing motion comments (fixes #3420) 2017-09-27 09:20:07 +02:00
FinnStutzenstein
841383d414 Serve Logos 2017-09-26 10:56:43 +02:00
FinnStutzenstein
ab08708ec1 Hide password in change password view 2017-09-26 09:03:05 +02:00
Emanuel Schütze
88fabd10ab Merge pull request #3416 from FinnStutzenstein/MotionCommentsFix2 
Fixing special comments fields.
 2017-09-22 13:54:16 +02:00
FinnStutzenstein
aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Emanuel Schütze
6f3e2a74f8 Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines 
Line break algorithm should not be distracted by newline characters
 2017-09-21 16:35:14 +02:00
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