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

6670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
56a804eb47
Merge pull request #4170 from MaximilianKrambach/importInitialFocus 
change initial focus of imports
 2019-01-24 14:38:45 +01:00
Maximilian Krambach
b620e5edfa change tab order in import tabs 2019-01-24 14:30:46 +01:00
Jochen Saalfeld
c7f87dfe1b
travis check for createsettings and migration, documented server 
debugging
 2019-01-24 11:41:15 +01:00
Finn Stutzenstein
1b3c0b4cee
Merge pull request #4152 from ostcar/new_projector_iv_motion_slide 
New projector IV
 2019-01-24 11:28:53 +01:00
Emanuel Schütze
ea7bff89ea
Merge pull request #4171 from emanuelschuetze/pwa-icons 
Updated PWA icons.
 2019-01-23 09:48:46 +01:00
Emanuel Schütze
80f795c9d0 Updated PWA icons. 2019-01-23 08:33:07 +01:00
Emanuel Schütze
c48148fc01
Merge pull request #4169 from tsiegleauq/gender-client 
Add gender field to users
 2019-01-22 13:35:25 +01:00
Emanuel Schütze
7b8839f4fa
Merge pull request #4164 from MaximilianKrambach/stateRecExtensions 
set/read state+recommendation extensions
 2019-01-22 13:14:22 +01:00
Emanuel Schütze
5e11d04791
Merge pull request #4168 from emanuelschuetze/new-migrations 
Added missing projector migration.
 2019-01-22 13:09:48 +01:00
Maximilian Krambach
caed18ef03 set/read state+recommendation extensions 2019-01-22 13:01:00 +01:00
Emanuel Schütze
cf29f39b9f Added missing projector migration. 2019-01-22 12:59:33 +01:00
Sean Engelhardt
07ca50441a Add gender field to users 
Alters the user detail view and the list of speakers to
support the gender field.
Default selection of genders was set to "Female", "Male"
and "Diverse".
Adding genders to users is completely optional
 2019-01-22 12:57:47 +01:00
Emanuel Schütze
bde292b13e
Merge pull request #4162 from tsiegleauq/pdfmake-vfs 
Add PDF custom fonts
 2019-01-22 12:13:17 +01:00
Emanuel Schütze
e6e0ef7e61
Merge pull request #4160 from MaximilianKrambach/searchHistory 
search History
 2019-01-22 12:03:16 +01:00
Sean Engelhardt
e680ca38da Add PDF custom fonts 2019-01-22 11:59: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
cca28a990a New projector IV 
* Motion Slide
 2019-01-20 13:35:50 +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