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

5303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emanuel Schütze
2fde162357 Fix linebreak after microphone icon in speakers overlay. 2017-12-15 09:21:51 +01:00
Emanuel Schütze
b3a71a741f
Merge pull request #3514 from emanuelschuetze/assignmentHTMLFix 
Remove HTML tags from description in assignment PDF.
 2017-12-15 09:18:54 +01:00
Emanuel Schütze
aad74bdbb4 Remove HTML tags from description in assigment PDF. 
Fix usage of clearfix in assignment templates.
 2017-12-15 08:49:45 +01:00
Emanuel Schütze
2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest 
Send invitation emails
 2017-12-15 08:29:09 +01:00
FinnStutzenstein
2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
Norman Jäckel
912876c895
Merge pull request #3505 from FinnStutzenstein/legalNotice 
extended the legal notice page (fixes #3504)
 2017-12-11 21:49:00 +01:00
Emanuel Schütze
52ffe95226
Merge pull request #3508 from emanuelschuetze/assignmentImprovements 
Assignment improvements
 2017-12-05 14:17:22 +01:00
Emanuel Schütze
3d264683ff Assignment improvements 
- Use ckeditor for assignment description field (e.g. for candidatures
  using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
  for candidate rows.
 2017-12-05 14:04:35 +01:00
FinnStutzenstein
a998657923 extended the legal notice page (fixes #3504) 2017-12-05 07:55:12 +01:00
Emanuel Schütze
8da08d9b36
Merge pull request #3506 from emanuelschuetze/translations 
Updated German translations.
 2017-12-01 16:36:18 +01:00
Emanuel Schütze
95be44e7f7 Updated German translations. 2017-12-01 12:07:50 +01:00
Emanuel Schütze
a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation 
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
 2017-12-01 09:34:56 +01:00
Emanuel Schütze
5caeb11a1c
Merge pull request #3501 from FinnStutzenstein/motionFilter 
Added is amendment filter, fixed ckeditor image browser logo, changed…
 2017-12-01 09:26:46 +01:00
FinnStutzenstein
b6a2530618 Reduce autoupdates by adding a follow_recommendation view (fixes #3488, fixes #3489) 2017-12-01 09:17:50 +01:00
FinnStutzenstein
34ac4a347c Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout 2017-12-01 09:16:48 +01:00
Norman Jäckel
3ac1c3c756
Merge pull request #3495 from FinnStutzenstein/ChangeRecoOther 
New change recommendation type other
 2017-11-30 21:52:17 +01:00
Norman Jäckel
21b652ec74
Merge pull request #3496 from FinnStutzenstein/UserRegisterForm 
Added presence view
 2017-11-30 21:48:44 +01:00
Norman Jäckel
af2af7e6d2
Merge pull request #3500 from FinnStutzenstein/motionSorting 
Fixed sorting
 2017-11-30 21:45:30 +01:00
Norman Jäckel
05e747cd48
Merge pull request #3502 from FinnStutzenstein/fullscreenCountdown 
Countdown in a fullscreen view
 2017-11-30 21:31:42 +01:00
FinnStutzenstein
6e4fae522b CountdownView 2017-11-28 13:54:23 +01:00
Emanuel Schütze
174e8076ac
Merge pull request #3487 from FinnStutzenstein/twisted 
Use native twisted for daphne
 2017-11-28 12:10:39 +01:00
FinnStutzenstein
513f2a887f Use native twisted for daphne 2017-11-28 11:06:39 +01:00
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00