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

6727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
d071bb1d47
Merge pull request #4454 from emanuelschuetze/motion-detail-layout-fix 
Reduce height of controls to fix linenumbering layout.
 2019-03-04 21:38:56 +01:00
Oskar Hahn
dd4754d045 Disable the future-lock when updating the restircted data cache 
Before this commit, there where two different locks when updating the restricted
data cache. A future lock, what is faster but only works in the same thread. The
other lock is in redis, it is not so fast, but also works in many threads.

The future lock was buggy, because on a second call of update_restricted_data
the same future was reused. So on the second run, the future was already done.

I don't see any way to delete. The last client would have to delete it, but there
is no way to find out which client the last one is.
 2019-03-04 21:37:00 +01:00
Emanuel Schütze
176fb9943d Reduce height of controls to fix linenumbering layout. 
in motion detail view with outside numbering
 2019-03-04 15:27:19 +01:00
Emanuel Schütze
37f9d5c94a
Merge pull request #4453 from emanuelschuetze/fixPdf 
Fixed linenumbering error on building motion pdf (checks if element i…
 2019-03-04 15:26:49 +01:00
Emanuel Schütze
22783f876b Fixed linenumbering error on building motion pdf (checks if element is null). 2019-03-04 15:02:06 +01:00
FinnStutzenstein
9198058bd7 Search in related objects 2019-03-04 13:36:34 +01:00
Maximilian Krambach
cc5e38faad change config update behavior for editors 
tinyMCE editors will not update after a timeout, but when focus changes
or the editor is destroyed
 2019-03-04 11:50:07 +01:00
Emanuel Schütze
4174f70d2b
Merge pull request #4448 from normanjaeckel/SetStateView 
Set state view
 2019-03-04 11:17:33 +01:00
Emanuel Schütze
13eb764668
Merge pull request #4447 from normanjaeckel/FixOnDelete 
Fixed on_delete field attr. Fixed #4405
 2019-03-04 11:12:01 +01:00
Norman Jäckel
e22274653d Added identifier to saved fields on multiple state management. 2019-03-01 21:11:27 +01:00
Norman Jäckel
c21d8be108 Revert "fix identifier setting on mass setstate" 
This reverts commit e870ed495a.
 2019-03-01 21:09:01 +01:00
Norman Jäckel
9eec2404dd Fixed on_delete field attr. Fixed #4405 2019-03-01 20:53:01 +01:00
Emanuel Schütze
4366f753f4
Merge pull request #4446 from emanuelschuetze/projector-h1 
Minor projector css changes
 2019-03-01 15:13:21 +01:00
Emanuel Schütze
ff410a4954 Minor projector css/wording changes 2019-03-01 14:52:29 +01:00
Emanuel Schütze
40de87c5b4
Merge pull request #4444 from FinnStutzenstein/stableElementsCleanup 
clean up stable projectorelements, if they have an error
 2019-03-01 14:03:19 +01:00
Emanuel Schütze
c8c55ce597
Merge pull request #4441 from FinnStutzenstein/closReference 
One global clos reference. More projector buttons for the clos view
 2019-03-01 13:37:28 +01:00
Emanuel Schütze
6e4a110116 List of speakers template 2019-03-01 13:17:30 +01:00
FinnStutzenstein
d0e6681aad One global clos reference. More projector buttons for the clos view 2019-03-01 13:17:26 +01:00
FinnStutzenstein
43f084438d clean up stable projectorelements, if they have an error 2019-03-01 13:03:55 +01:00
Emanuel Schütze
c140399fa7
Merge pull request #4440 from FinnStutzenstein/clockFontColor 
set the clock color to the header color of the projector
 2019-03-01 12:35:41 +01:00
Finn Stutzenstein
94cd032f79
Merge pull request #4443 from FinnStutzenstein/countdownMigrationFix 
Fixed countdown model
 2019-03-01 12:32:43 +01:00
FinnStutzenstein
ab0955d890 Fixed countdown model 2019-03-01 12:10:49 +01:00
FinnStutzenstein
d3773bc8e8 set the clock color to the header color of the projector 2019-03-01 12:06:46 +01:00
Finn Stutzenstein
69fe4632f4
Merge pull request #4419 from MaximilianKrambach/countdown 
countdown: new title field, description made optional
 2019-03-01 12:02:50 +01:00
Emanuel Schütze
b576d2c396
Merge pull request #4439 from MaximilianKrambach/cssState 
consolidate state css colors
 2019-03-01 11:24:50 +01:00
Maximilian Krambach
44d16eb244 countdown: new title field, description optional 2019-03-01 11:22:09 +01:00
Maximilian Krambach
b704a3b09f consolidate state css colors 2019-03-01 11:11:13 +01:00
Emanuel Schütze
08e076f4a4
Merge pull request #4438 from FinnStutzenstein/addItemNumberToTopicTitle 
Add item number to topic title
 2019-03-01 10:50:53 +01:00
FinnStutzenstein
3f77cc7b24 Add item number to topic title, hide clos slide for one projector 2019-03-01 10:26:52 +01:00
Emanuel Schütze
573cdd88a2
Merge pull request #4427 from FinnStutzenstein/motionProjectionMode 
motion projection mode is optional and sensitive for the config
 2019-03-01 10:23:55 +01:00
FinnStutzenstein
384597afb9 motion projection mode is optional and sensitive for the config 2019-03-01 10:08:57 +01:00
Emanuel Schütze
a9de755047
Merge pull request #4437 from emanuelschuetze/translations20190228 
Updated translations
 2019-02-28 23:00:11 +01:00
Emanuel Schütze
4de14f4100 Updated translations 2019-02-28 22:46:38 +01:00
Emanuel Schütze
f8e0718a22
Merge pull request #4436 from tsiegleauq/projector-detail-ui 
Clean projector detail interface
 2019-02-28 22:29:29 +01:00
Emanuel Schütze
2257991aba Projector detail template improvements 2019-02-28 22:15:07 +01:00
Sean Engelhardt
587a0fe443 Clean projector detail interface 
Alters the projector detail interface to provide better usability.
Alters the dragging slightly to have a nice preview and smoother
transitions.
 2019-02-28 22:14:33 +01:00
Emanuel Schütze
d77abf5934
Merge pull request #4435 from MaximilianKrambach/motion_deleteCategory 
fix unsetting some values
 2019-02-28 19:24:40 +01:00
Maximilian Krambach
4e3948a24d fix unsetting some values 
- Category prefix
- category in motion multiSelect
 2019-02-28 19:06:32 +01:00
Emanuel Schütze
0c1abe561b
Merge pull request #4433 from tsiegleauq/speaker-repo 
Speaker repo
 2019-02-28 16:21:14 +01:00
Emanuel Schütze
8c68e93596
Merge pull request #4434 from MaximilianKrambach/stopProopagation 
fix click events in user + mediafile views
 2019-02-28 16:18:10 +01:00
Maximilian Krambach
feca9e4a18 fix click events in user + mediafile views 
stopped propagation on soome buttons and menus
 2019-02-28 16:05:28 +01:00
Emanuel Schütze
51026286cb
Merge pull request #4429 from FinnStutzenstein/clearRepositories 
clear repositories and extra DS clear on logout
 2019-02-28 15:59:12 +01:00
Emanuel Schütze
24008da0df
Merge pull request #4430 from FinnStutzenstein/fixSlideMargin 
Fix slide container margin
 2019-02-28 15:36:11 +01:00
FinnStutzenstein
7dee5acc7e Fix slide container margin 2019-02-28 15:23:43 +01:00
Emanuel Schütze
3f7f12e3ad
Merge pull request #4431 from MaximilianKrambach/resetPassword 
permission for admins to reset passwords
 2019-02-28 14:33:04 +01:00
Sean Engelhardt
03c590c66d Speaker repo 
Add an own repository service to manage speakers
 2019-02-28 14:26:31 +01:00
Maximilian Krambach
036ce4f02c permission for admins to reset passwords 2019-02-28 11:29:58 +01:00
FinnStutzenstein
3432c66d4d clear repositories and extra DS clear on logout 2019-02-28 11:04:19 +01:00
Emanuel Schütze
9e2d42f9f4
Merge pull request #4426 from FinnStutzenstein/addElementtoPreview 
Add elements to preview button
 2019-02-28 10:45:18 +01:00
Finn Stutzenstein
77e192719d
Merge pull request #4424 from FinnStutzenstein/reviveGlobalSearch 
Revive the global search.
 2019-02-28 09:54:01 +01:00