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

7574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Finn Stutzenstein
d248f5fbc1
Merge pull request #5122 from tsiegleauq/fix-regression-in-assignments 
Fix regression in assignments
 2019-11-08 11:45:42 +01:00
Sean Engelhardt
b0695a25c1 Fix regression in assignments 
Fixes a bug where assignment polls could not be saved
Cleaned up some code
 2019-11-08 09:42:42 +01:00
Emanuel Schütze
d286378524
Merge pull request #5104 from jsangmeister/csv-import-fix 
Fixed CSV import
 2019-11-06 11:03:08 +01:00
jsangmeister
0922f0de3f fixed csv import 2019-11-06 10:43:56 +01:00
Emanuel Schütze
69a904c058
Merge pull request #5118 from tsiegleauq/download-does-not-work 
Fixes a bug where files are not known as files
 2019-11-06 10:22:52 +01:00
Sean Engelhardt
d482f205cd Fixes a bug where files are not known as files 
This is a regression from model change.
The is_file method is missing. Replaces is_file with !is_directory
 2019-11-06 10:12:15 +01:00
Sean
be2e8d9584
Merge pull request #5117 from FinnStutzenstein/fixGroupsMatrix 
Fixed duplicate permissions in the group matrix (fixed #5112)
 2019-11-05 14:55:12 +01:00
Sean
e15619806d
Merge pull request #5057 from GabrielInTheWorld/savingSearch 
Shows all related items of one collection
 2019-11-05 12:29:21 +01:00
FinnStutzenstein
fed9f3c19b Fixed duplicate permissions in the group matrix (fixed #5112) 2019-11-05 11:39:52 +01:00
Finn Stutzenstein
1dcb496147
Merge pull request #5111 from jsangmeister/default-to-reference-projector 
Change wording from 'default' to 'reference' projector
 2019-11-05 10:04:11 +01:00
jsangmeister
fa95859b61 change 'default' to 'reference' projector 2019-11-05 09:47:05 +01:00
Emanuel Schütze
66390fe92c
Merge pull request #5108 from emanuelschuetze/translations20191104 
Updated translations
 2019-11-04 16:39:42 +01:00
Emanuel Schütze
9e43d0f63e Updated German translations 2019-11-04 15:46:09 +01:00
Emanuel Schütze
8b3d0afb9e
Merge pull request #5110 from tsiegleauq/tiles-dont-do-anything 
Fix motion tiles filter
 2019-11-04 15:45:02 +01:00
Sean Engelhardt
24359450c7 Fix motion tiles filter 
Fixes an error where motion tile filter could not be applied due
to changing category filter definition
 2019-11-04 15:23:49 +01:00
Emanuel Schütze
b867b02e28
Merge pull request #5058 from tsiegleauq/rework-choice-service 
Rework choice service and dialog
 2019-11-04 13:48:44 +01:00
Emanuel Schütze
9d7d4b8620
Merge pull request #5043 from tsiegleauq/new-projector-list 
Enhance projector list
 2019-11-04 13:44:53 +01:00
Sean Engelhardt
233961b466 Enhance projector list 
- The projector list now scales to give a better overview
- selecting the projector for the CLOS reference is more intuitive
- editing and creating projectors now works over a dialog
- editing projectors is now possible from the detail page
- projector tiles look overall cleaner
- Editing the projector offers a preview
- no changes "on the fly"
- Dialog has apply button to allow saving without closing
- The slider has an input fild on the right side to allow the usage
  of specific values
 2019-11-04 13:30:25 +01:00
Finn Stutzenstein
f62b506dee
Merge pull request #5103 from jsangmeister/reference-projector-view 
Added a view to change the reference projector in one api call
 2019-11-01 12:19:41 +01:00
jsangmeister
96ac370f61 added a view to change the reference projector in one api call 2019-11-01 10:56:59 +01:00
Finn Stutzenstein
0ab46ed955
Merge pull request #5099 from jsangmeister/email-error-fix 
Fixed error output of http service to correctly display email validation error
 2019-10-30 15:22:19 +01:00
jsangmeister
85a11c8b39 fixed error output to correctly display email validation error 2019-10-30 14:01:12 +01:00
Sean
113bdc76f3
Merge pull request #5088 from emanuelschuetze/motion-slide-box 
Use horizontal meta box ('pdf style table') for motion slide
 2019-10-30 13:34:41 +01:00
Emanuel Schütze
5305b52dba Use horizontal meta box ('pdf style table') for motion slide 2019-10-30 13:18:40 +01:00
Sean
6081df202c
Merge pull request #5089 from emanuelschuetze/layout-fixes 
Minor layout fixes (chyron, list of speakers)
 2019-10-30 12:33:44 +01:00
Emanuel Schütze
68dad5561e Minor layout fixes (chyron, list of speakers) 
- use bold font for names on chyron
- Fix box height for list of speakers view (for normal users in Firefox)
 2019-10-30 12:14:27 +01:00
Sean
9ae4472b0d
Merge pull request #5086 from GabrielInTheWorld/editStart 
Adds the 'edit-mode' to start, legal-notice and privacy-policy
 2019-10-30 12:04:51 +01:00
Sean
19f3fb579b
Merge pull request #5083 from GabrielInTheWorld/hintsForTheWin 
Replaces the question-marks in config with hints
 2019-10-30 11:57:55 +01:00
Sean
424c59d027
Merge pull request #5094 from GabrielInTheWorld/agendaSecondLine 
Sets the subtitle as a second line in agenda
 2019-10-30 11:38:50 +01:00
Sean
d12bf299cc
Merge pull request #5096 from jsangmeister/settings-safety-check 
Added safety check before reset in config
 2019-10-30 11:23:44 +01:00
Sean
985e54dcd5
Merge pull request #5087 from tsiegleauq/proxy-filter-issues 
Repair motion filter for proxies
 2019-10-30 11:22:32 +01:00
Sean
cc2dc1eeff
Merge pull request #5092 from GabrielInTheWorld/fixDecoding 
Fixes decoding caused by exceeding stack size
 2019-10-30 11:21:11 +01:00
jsangmeister
66f397f189 added safety check before reset in config 2019-10-30 09:56:43 +01:00
GabrielMeyer
0c4bcd4bd8 Sets the subtitle as a second line in agenda 2019-10-29 16:22:56 +01:00
Finn Stutzenstein
98a7d4dcdf
Merge pull request #5093 from GabrielInTheWorld/fixPythonTest 
Fixes python3.7 tests
 2019-10-29 15:24:16 +01:00
GabrielMeyer
b806b8406b Fixes python3.7 tests 2019-10-29 15:05:52 +01:00
GabrielMeyer
efa8f37528 Fixes decoding caused by exceeding stack size 2019-10-29 14:02:14 +01:00
Finn Stutzenstein
8335662e9b
Merge pull request #5084 from GabrielInTheWorld/filterAgenda 
Adds filtering by collection as a new filter for the agenda
 2019-10-24 10:23:14 +02:00
Sean
c7734a3b9e
Merge pull request #5085 from tsiegleauq/txt-encode-dep 
Replace encode and decode
 2019-10-24 10:19:36 +02:00
GabrielMeyer
663d230561 Adds the 'edit-mode' to start, legal-notice and privacy-policy 2019-10-24 09:15:01 +02:00
GabrielMeyer
19347f89d0 Replaces the question-marks in config with hints 2019-10-24 09:02:15 +02:00
Sean Engelhardt
342b881af4 Repair motion filter for proxies 
The View Model Proxies are currently breaking all filter operations.
This reparis the motion filters
 2019-10-23 15:25:56 +02:00
Sean Engelhardt
62eba77925 Rework choice service and dialog 
- cleans up the choice service and the choice dialogs to make them
simpler and more usable.
- adjusts search-value-selector to also accept lists
- the search value selector allows for better filtering of models in the choice dialog
- fixes an issue where deleting all tags required a selection
 2019-10-23 10:41:58 +02:00
GabrielMeyer
b48c8ad1da Shows all related items of one collection 2019-10-22 17:18:04 +02:00
GabrielMeyer
df1b03698c Adds filtering by collection as a new filter for the agenda 2019-10-22 15:54:46 +02:00
Sean
d3efba9dd5 Replace encode and decode 
Replaces encode and decode with manual functions
 2019-10-21 17:25:16 +02:00
Finn Stutzenstein
62e5774c8d
Merge pull request #4878 from FinnStutzenstein/moveConfigData 
Reworked config
 2019-10-21 14:13:02 +02:00
Finn Stutzenstein
caf05a3e87
Merge pull request #5000 from FinnStutzenstein/saml 
[WIP] saml integration
 2019-10-21 14:09:49 +02:00
FinnStutzenstein
cf7a5ce714 Reworked config 
- Move config meta data into REST
- seperate views for config groups
 2019-10-21 13:45:06 +02:00
FinnStutzenstein
4a77bf1a61 saml 2019-10-21 13:34:01 +02:00