ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,679 Commits 6 Branches 42 Tags 64 MiB
11aacc71b6
Commit Graph

4679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Emanuel Schütze
cbccd17752 Fixed translation strings and updated German translations. 2017-04-12 20:03:07 +02:00
FinnStutzenstein
845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze
d1ff1e540f Fixed regression that opening of motion create form failed. 
Introduced with commit 3de4a2af1c.
 2017-04-12 15:17:47 +02:00
Emanuel Schütze
6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert 
Add local convert to Base64 (Fixes #2705)
 2017-04-12 15:09:43 +02:00
Sean Engelhardt
65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
Emanuel Schütze
2be9d45884 Merge pull request #3184 from FinnStutzenstein/Logo 
Support logos
 2017-04-12 14:49:59 +02:00
FinnStutzenstein
6c932aa77a Support logos 2017-04-12 14:28:46 +02:00
Emanuel Schütze
b9bab6fc17 Merge pull request #3191 from normanjaeckel/FreeUser 
User without permission to see users can now see some of them.
 2017-04-12 10:20:48 +02:00
Emanuel Schütze
34c7b51159 Merge pull request #3194 from emanuelschuetze/motionCommentFix 
Fixed empty motion comment field in motion update form.
 2017-04-11 17:19:14 +02:00
Norman Jäckel
c4ec26c4c0 User without permission to see users can now see some required users. 
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
 2017-04-11 17:10:49 +02:00
Emanuel Schütze
3de4a2af1c Fixed empty motion comment field in motion update form. 
Motion comment values were not extracted. Concerns edit button in
motion list view only.
 2017-04-11 17:08:19 +02:00
Emanuel Schütze
152585a73f Merge pull request #3193 from emanuelschuetze/sortLastSpeakers 
Fixed sorting of last speakers.
 2017-04-11 17:06:25 +02:00
Emanuel Schütze
23fec417f8 Fixed sorting of last speakers. 2017-04-11 15:55:45 +02:00
Norman Jäckel
cf9d204e18 Merge pull request #3187 from FinnStutzenstein/Issue3186 
Fixes #3060, fixes #3186.
 2017-04-07 16:47:42 +02:00
Norman Jäckel
66ad801bad Merge pull request #3172 from FinnStutzenstein/logout 
Do not reload on logout (fixes #2868).
 2017-04-07 16:32:41 +02:00
FinnStutzenstein
c86f6d3684 Do not reload on logout (fixes #2868) 2017-04-07 16:22:32 +02:00
FinnStutzenstein
cefdabc3d7 fixes #3060, fixes #3186 2017-04-07 15:16:09 +02:00
Emanuel Schütze
598dc30486 Merge pull request #3185 from FinnStutzenstein/export-dialog 
Export dialog for motions
 2017-04-07 15:09:15 +02:00
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze
4ffbe77814 Merge pull request #3182 from emanuelschuetze/Release-2.1.1 
Release 2.1.1
 2017-04-05 21:48:20 +02:00