Commit Graph

6686 Commits

Author SHA1 Message Date
Emanuel Schütze
23f7dce6a2 Fixes for using pypi package
- Fix static path for manifest and login logo.
- Use insecure=True (required to serve static files via development
  server with DEBUG=False).
2019-01-20 09:37:42 +01:00
Emanuel Schütze
034a4d2a67
Merge pull request #4144 from MaximilianKrambach/dateSort
sort by date in motion
2019-01-19 22:43:29 +01:00
Emanuel Schütze
ec769a82a4
Merge pull request #4151 from emanuelschuetze/rest
Revert rest fix for proxy.conf.json
2019-01-19 22:41:19 +01:00
Norman Jäckel
7c6e98fae6 Fixed following recommendations with extensions. 2019-01-19 22:36:41 +01:00
Norman Jäckel
030f610f2f Fixed last_modified saving. 2019-01-19 22:11:40 +01:00
Emanuel Schütze
a7eaecfa14
Merge pull request #4143 from MaximilianKrambach/callList
Speaker list opening/closing/clearing
2019-01-19 22:05:45 +01:00
Emanuel Schütze
16ee9414dc Revert rest fix for proxy.conf.json
see commit c703ba9e5f
2019-01-19 21:59:32 +01:00
Maximilian Krambach
f47ec28977 speaker remove/ open+close list functionality 2019-01-19 21:50:22 +01:00
Maximilian Krambach
10550fe228 fix server set marked for users that already have spoken 2019-01-19 21:28:18 +01:00
FinnStutzenstein
74e0bea108 Wirst work for the projector system on the client 2019-01-19 21:26:05 +01:00
Maximilian Krambach
6d18d70845 sort by date in motion 2019-01-19 21:21:20 +01:00
Emanuel Schütze
12c6554064
Merge pull request #4146 from MaximilianKrambach/configReset
config reset
2019-01-19 21:12:52 +01:00
Emanuel Schütze
c26daad07d
Merge pull request #4149 from MaximilianKrambach/fixMotionPermission
fix motion change permission
2019-01-19 21:09:00 +01:00
Emanuel Schütze
e6db2c97fc
Merge pull request #4142 from boehlke/fix_mediafiles_add
Extra check for type in updateValues
2019-01-19 21:05:12 +01:00
Maximilian Krambach
30d8812719 fix motion change permission 2019-01-19 19:01:44 +01:00
Maximilian Krambach
e8de30b23e config reset 2019-01-19 18:19:57 +01:00
Oskar Hahn
df85e01b16
Merge pull request #4145 from ostcar/logged_in_users
logged in users
2019-01-19 18:00:47 +01:00
Oskar Hahn
5ca2012c44 logged in users 2019-01-19 17:50:18 +01:00
Oskar Hahn
a83de77180
Merge pull request #4141 from normanjaeckel/HistoryInformation
Added history information for some motion views.
2019-01-19 16:56:10 +01:00
Norman Jäckel
9db12293a3 Added history information for some motion views. 2019-01-19 16:41:58 +01:00
André Böhlke
5d458e01d4 Extra check for type in updateValues 2019-01-19 16:26:18 +01:00
Emanuel Schütze
3582e71bba
Merge pull request #4132 from MaximilianKrambach/motionViewPermissions
adding viewPermissions
2019-01-19 16:05:47 +01:00
Norman Jäckel
6aeedf39fd
Merge pull request #4140 from ostcar/autoupdate_and_delete
Autoupdate on element deletion
2019-01-19 15:50:47 +01:00
Oskar Hahn
7df842f2e2 delete wrong file 2019-01-19 14:48:01 +01:00
Oskar Hahn
11ba7b9841 Autoupdate on element deletion
Make sure, that a related element gets an autoupdate, when the main object is deleted
2019-01-19 14:46:59 +01:00
Maximilian Krambach
fb51b54d5c check permissions for motions 2019-01-19 14:42:54 +01:00
Oskar Hahn
a895481cef
Merge pull request #4131 from normanjaeckel/PasswordPerm
Added new permission to set password.
2019-01-19 14:33:10 +01:00
Oskar Hahn
27cb63174e
Merge pull request #4134 from normanjaeckel/MotionCreatedTimestamp
Added timestamp fields for motions.
2019-01-19 14:23:21 +01:00
Oskar Hahn
7a64fb83eb
Merge pull request #4135 from ostcar/projector_http_view
New projector III
2019-01-19 14:04:28 +01:00
Norman Jäckel
5aedf62018
Merge pull request #4104 from normanjaeckel/HistoryTimestamp
Used the same timestamp for multiple history objects.
2019-01-19 14:03:47 +01:00
Emanuel Schütze
2d40072f44
Merge pull request #4133 from MaximilianKrambach/sortEmpties
move empty/undefined sortings always to the alphabet's end
2019-01-19 11:55:10 +01:00
Maximilian Krambach
91dec2370b move empty/undefined sortings always to the alphabet's end 2019-01-19 11:41:17 +01:00
Emanuel Schütze
62c88280b6
Merge pull request #4137 from tsiegleauq/viewport-tablet-fixes
Fix naviagion hiding
2019-01-19 11:37:51 +01:00
Emanuel Schütze
36b72d573c
Merge pull request #4138 from tsiegleauq/enable-rest-for-ngsw
Allow navigating to /rest/ for the new ngsw setup
2019-01-19 11:37:33 +01:00
Emanuel Schütze
b03538e564
Merge pull request #4136 from MaximilianKrambach/bulkState
client part of setMultiState
2019-01-19 11:21:51 +01:00
Norman Jäckel
b15a57bbdd Added timestamp fields for motions. 2019-01-19 11:09:55 +01:00
Sean Engelhardt
9d3410af1c Fix naviagion hiding
Fixes an issue where the navigation panel was always hiding during
every navigation.

Also changes the backdrop of the navigation
2019-01-19 11:07:37 +01:00
Maximilian Krambach
6cd250a36d client part of setMultiState 2019-01-19 10:56:19 +01:00
Sean Engelhardt
c703ba9e5f Allow navigating to /rest/ for the new ngsw setup 2019-01-19 10:49:40 +01:00
Oskar Hahn
b4c3ffe01f New projector III
* Add a new view `project` to set the projector elements-fields
2019-01-19 10:47:11 +01:00
Norman Jäckel
cb3e6c4e47
Merge pull request #4123 from normanjaeckel/BulkState
Set state for multiple motions.
2019-01-19 10:37:39 +01:00
Norman Jäckel
4da87d520d Added new permission to set password. 2019-01-19 10:35:13 +01:00
Norman Jäckel
de7b531933 Used the same timestamp for multiple history objects. 2019-01-19 09:58:58 +01:00
Norman Jäckel
4261c3deed Set state for multiple motions. 2019-01-19 09:22:02 +01:00
Emanuel Schütze
1cdeb3bcb8
Merge pull request #4124 from normanjaeckel/Gender
Added gender field for users.
2019-01-19 09:17:08 +01:00
Oskar Hahn
24bb4ad0ad
Merge pull request #4130 from ostcar/new_projector_ii
New projector II
2019-01-19 09:01:43 +01:00
Oskar Hahn
c37bf0fb4f New Projector
* Change Projector model
* Remove old http requests
* Remove old config values
* Remove uuid from config field
* Remove projector broadcast
* Remove projector blank
* Fix serializer
2019-01-19 08:19:40 +01:00
Emanuel Schütze
2d2a62402c
Merge pull request #4128 from normanjaeckel/AmendmentPerm
Added new permissions to create new amendments.
2019-01-18 22:23:06 +01:00
Emanuel Schütze
4985dea59d
Merge pull request #4127 from emanuelschuetze/ui
UI improvements
2019-01-18 22:07:50 +01:00
Norman Jäckel
85d9629776 Added new permissions to create new amendments. 2019-01-18 22:06:15 +01:00