Commit Graph

5955 Commits

Author SHA1 Message Date
Emanuel Schütze
e6e0ef7e61
Merge pull request #4160 from MaximilianKrambach/searchHistory
search History
2019-01-22 12:03:16 +01:00
Sean
aa668b72d9
Merge pull request #4167 from MaximilianKrambach/shortenTitle
shortening motion titles
2019-01-22 11:37:37 +01:00
Maximilian Krambach
7f68fef7ad search History 2019-01-22 11:33:35 +01:00
Sean
20bb92466b
Merge pull request #4161 from MaximilianKrambach/passwordRestrictions
reset password permission check in menu
2019-01-22 11:26:59 +01:00
Maximilian Krambach
30f97935e0 reset password permission check in menu 2019-01-22 10:19:50 +01:00
Maximilian Krambach
23298a03b3 Shortening motion titles 2019-01-22 10:10:42 +01:00
Emanuel Schütze
c67aef68d9
Merge pull request #4163 from emanuelschuetze/translations
Updated translation strings and German translation.
2019-01-22 09:19:26 +01:00
Emanuel Schütze
6b66a208c5 Updated translation strings and German translation. 2019-01-21 22:50:10 +01:00
Emanuel Schütze
07f65601e1
Merge pull request #4158 from emanuelschuetze/username
Show username if full_name or last_name is empty.
2019-01-21 22:48:22 +01:00
Emanuel Schütze
2c5ea299e3 Show username if full_name or last_name is empty.
important for create-example_data
2019-01-21 16:01:16 +01:00
Oskar Hahn
209105efc3
Merge pull request #4103 from FinnStutzenstein/client-projector-ui
Client projector ui (WIP)
2019-01-20 11:39:49 +01:00
Emanuel Schütze
402fc37b99
Merge pull request #4155 from ostcar/activate_start_command
activate start command
2019-01-20 11:36:06 +01:00
Emanuel Schütze
f2ffe64f98
Merge pull request #4157 from emanuelschuetze/fix-history-migration
Fix history migration.
2019-01-20 11:28:32 +01:00
Oskar Hahn
6b73c5bf1a activate start command 2019-01-20 11:24:42 +01:00
Emanuel Schütze
c704b90ecb Fix history migration. 2019-01-20 11:05:49 +01:00
Emanuel Schütze
251cc4acc1
Merge pull request #4147 from emanuelschuetze/history-table
Improved history table.
2019-01-20 10:35:23 +01:00
Emanuel Schütze
33d9468e6b
Merge pull request #4153 from normanjaeckel/RecExtension
Fixed following recommendations with extensions.
2019-01-20 10:21:56 +01:00
Emanuel Schütze
344debf03a
Merge pull request #4154 from emanuelschuetze/static
Fixes for using pypi package
2019-01-20 09:57:35 +01:00
Emanuel Schütze
2c5d8ea29e Improved history table. 2019-01-20 09:46:41 +01:00
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