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

6661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FinnStutzenstein
35056f5ccc seperate motion version migration operations 2019-02-07 09:28:12 +01:00
Emanuel Schütze
c84f8196fc
Merge pull request #4252 from MaximilianKrambach/speakertime 
improve start time and duration display for finished speakers
 2019-02-06 17:52:19 +01:00
Maximilian Krambach
056a20964c improve start time and duration display for finished speakers 2019-02-06 17:01:15 +01:00
Maximilian Krambach
2fbd11dc00 fix #4065 2019-02-06 16:53:26 +01:00
GabrielMeyer
da94a4f947 Fixes the initial loading of motions and their states 
Fixes #4262
- If the workflow is changed, then the state of the motion will be updated, too
 2019-02-06 12:12:32 +01:00
Sean
eab6e9bfd0
Merge pull request #4259 from GabrielInTheWorld/4258 
Prevent mistakenly closing the window
 2019-02-06 10:39:42 +01:00
Emanuel Schütze
83d9dbed9e
Merge pull request #4265 from emanuelschuetze/login 
Fixed login problem for non admin users.
 2019-02-05 21:26:21 +01:00
Emanuel Schütze
722a40779d Fixed login problem for non admin users. 2019-02-05 21:03:13 +01:00
Emanuel Schütze
7e95899353
Merge pull request #4261 from tsiegleauq/fix-empty-pdf-style 
Fix PDF style interpretation
 2019-02-05 16:11:03 +01:00
Sean Engelhardt
b200169de9 Fix pdf style interpretation 
fix false style information during recursife pdf generateion
fix an error where styling items in a list resultid in unexpected
list definitions
 2019-02-05 15:15:12 +01:00
Emanuel Schütze
4395b86b9c
Merge pull request #4216 from MaximilianKrambach/duration 
Estimated duration, and datetimepicker in config
 2019-02-05 14:49:58 +01:00
Emanuel Schütze
2ef3b6929f
Merge pull request #4255 from MaximilianKrambach/motionNavigation 
sort 'previous/next motion' by identifier in detail view
 2019-02-05 14:48:17 +01:00
GabrielMeyer
21f9715623 Fixes #4258 
- Added a listener to the `onBeforeUnload`-event.
- This prevent reloading or closing the window including `F5, Shift+F5, Ctrl+R, Ctrl+Shift+R, Crtl+W, closing the tab by 'x'`

Added comment to the event-function.
 2019-02-05 14:41:48 +01:00
Maximilian Krambach
66a1ac1532 estimated duration, and datetimepicker in config 2019-02-05 13:49:48 +01:00
Maximilian Krambach
0a06d05bdd sort 'previous/next motion' by identifier in detail view 2019-02-05 13:48:27 +01:00
Sean
a52db89288
Merge pull request #4256 from emanuelschuetze/workflowid 
Fixed bug in getting workflow_id from config service.
 2019-02-05 13:17:36 +01:00
Emanuel Schütze
3884accffe Fixed bug in getting workflow_id from config service. 2019-02-05 12:07:34 +01:00
Jochen Saalfeld
90e6af9ef0
Merge pull request #4250 from jsaalfeld/pin_typescript_version 
pinning typescript to <3.3 - fixes #4249
 2019-02-05 08:37:35 +01:00
Jochen Saalfeld
114c8bfa3c
Merge pull request #4184 from ostcar/fix_gunicorn 
Opens the websocket connection before closing it
 2019-02-05 08:34:52 +01:00
Jochen Saalfeld
a64d436884
Merge pull request #4254 from ostcar/fix_partial_cache 
Make sure the cache is ensured before manipulating it
 2019-02-05 08:08:19 +01:00
Oskar Hahn
fae270a1d6 Make sure the cache is ensured before manipulating it 2019-02-04 17:41:18 +01:00
Emanuel Schütze
a6043ba8d5
Merge pull request #4251 from tsiegleauq/login-redirect-issues 
Allow reload on login children
 2019-02-04 15:30:52 +01:00
Sean Engelhardt
06bfa314cb Allow reload on login children 
Fixes a bug where the user was always redirected to
/login/ as unknown user, when they tried to
load children from login page from an external references.
 2019-02-04 15:17:03 +01:00
Sean
48b79ae24d
Merge pull request #4159 from CatoTH/Openslides3-Line-Highlighting 
Line highlighting
 2019-02-04 14:37:41 +01:00
Tobias Hößl
1bc17f2c6c Line highlighting 2019-02-04 13:17:24 +01:00
Jochen Saalfeld
f5ac1822bf
pinning typescript to <3.3 - fixes #4249 2019-02-04 11:55:58 +01:00
Emanuel Schütze
27ecb6f411
Merge pull request #4247 from emanuelschuetze/translation 
Updated translations
 2019-02-03 22:42:09 +01:00
Emanuel Schütze
a4fcc43121 Hotfix: Downgrade terser to 3.14.1 
see https://github.com/webpack-contrib/terser-webpack-plugin/issues/66
 2019-02-03 22:26:47 +01:00
Emanuel Schütze
ac96ba8d3a Updated translations 2019-02-03 22:12:26 +01:00
Finn Stutzenstein
fa63110889
Merge pull request #4150 from FinnStutzenstein/count-users 
count users via notify
 2019-02-02 10:45:52 +01:00
FinnStutzenstein
7ce1eb592f Count active users via notify (for admins only), absolute imports 2019-02-02 08:17:36 +01:00
Emanuel Schütze
768b97816f
Merge pull request #4211 from tsiegleauq/current-list-of-speakers 
Add current list of speakers to agenda-list
 2019-02-01 18:30:45 +01:00
Sean Engelhardt
0a7f905c21 Add current list of speakers to agenda-list 
Adds a current-list-of-speakers button to the agenda list view
The user may select a projector which will return an agenda item
which will be used to determine the CLOS
 2019-02-01 18:11:10 +01:00
Emanuel Schütze
f26f7f9c08
Merge pull request #4244 from MaximilianKrambach/callListPdf 
call list pdf export
 2019-02-01 18:04:48 +01:00
Emanuel Schütze
07a37cc243
Merge pull request #4236 from normanjaeckel/SetStateAllowSubmitterEdit 
Allow set state for submitters in some states.
 2019-02-01 17:56:31 +01:00
Maximilian Krambach
181d00ea94 call list pdf export 2019-02-01 17:48:29 +01:00
Emanuel Schütze
d4cc3c3720 Allow to set state as submitter in client. 2019-02-01 16:30:50 +01:00
Norman Jäckel
286c81e007 Allow set state for submitters in some states. 2019-02-01 16:10:51 +01:00
Emanuel Schütze
448ea6df28
Merge pull request #4235 from normanjaeckel/SubmitterPermissions 
Added new flag for states to hide motions from submitters.
 2019-02-01 16:08:51 +01:00
Norman Jäckel
c355326466 Added new flag to motion state to control access for different users. 2019-02-01 15:42:02 +01:00
Sean
e281b310a7
Merge pull request #4238 from MaximilianKrambach/historyNavigate 
navigate to detail view after setting the history mode
 2019-02-01 15:17:16 +01:00
Emanuel Schütze
7b840ca796
Merge pull request #4242 from tsiegleauq/motion-detail-ammendments 
Add amendment info in motion details
 2019-02-01 15:09:01 +01:00
Sean Engelhardt
01786f685c Add amendment info in motion details 
Alters motion detail to show amendments and to a given motion
and original motions to a given amendment.
Changes the motion PDF to show amendments.

Fixes a bug with the projection indicator
 2019-02-01 14:52:31 +01:00
Maximilian Krambach
ba6d3da8f0 navigate to detail view after setting the history mode 
(if a detailView is existant)
 2019-02-01 14:42:19 +01:00
Emanuel Schütze
dc1e48329f
Merge pull request #4241 from MaximilianKrambach/csvExport 
explicitly set mimetype for csv export
 2019-02-01 14:41:09 +01:00
Emanuel Schütze
3d7b833eeb Fix travis by downgrading pytest to <4.2.0 2019-02-01 14:28:34 +01:00
Maximilian Krambach
da722dd518 explicitly set mimetype for csv export 2019-02-01 14:20:00 +01:00
Sean
1b2258a4e5
Merge pull request #4239 from tsiegleauq/motion-detail-tags 
Add Tags into motion details
 2019-02-01 13:18:42 +01:00
Sean Engelhardt
f992b77d99 Add Tags into motion details 
Adds tags to motion repository,
view-motion and selectable for the motion detail view
 2019-02-01 12:34:42 +01:00
Finn Stutzenstein
f3c3d8ab8c
Merge pull request #4219 from FinnStutzenstein/cleanup 
A little bit of cleanup
 2019-02-01 11:16:35 +01:00