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

7553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FinnStutzenstein
fed9f3c19b Fixed duplicate permissions in the group matrix (fixed #5112) 2019-11-05 11:39:52 +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
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
Sean
9f25f2bc34
Merge pull request #5075 from jsangmeister/personal-comment-export 
Added motion export option for personal note and fixed export error
 2019-10-21 11:54:17 +02:00
Sean
33e2bb3498
Merge pull request #5079 from jsangmeister/long-state-fix 
Removed max-width on mat-menu-panel to display full state name
 2019-10-21 11:53:31 +02:00
jsangmeister
243949de43 added motion export option for personal note and fixed export error 2019-10-21 10:01:44 +02:00
jsangmeister
a328580a07 removed max-width on mat-menu-panel 2019-10-18 15:42:18 +02:00
Finn Stutzenstein
bcba878e18
Merge pull request #5078 from FinnStutzenstein/fixMaster 
Fixed typing from parse_qs
 2019-10-18 15:15:23 +02:00
FinnStutzenstein
3f41890541 Fixed typing from parse_qs 2019-10-18 14:41:55 +02:00
GabrielInTheWorld
d49f6124d3
Merge pull request #5071 from GabrielInTheWorld/prepareRecoState 
Editing state and recommendation in motion-list
 2019-10-16 16:16:59 +02:00
GabrielMeyer
1354fc74ef Editing state and recommendation in motion-list 
- In the info-dialog opening in the motion-list the user can update the current state and the recommendation for one motion.
 2019-10-16 15:58:47 +02:00
Finn Stutzenstein
2f01e46415
Merge pull request #5073 from FinnStutzenstein/ws404 
Closing websocket connections to unknown urls
 2019-10-16 12:04:59 +03:00
Sean
0df87fd522
Merge pull request #5076 from FinnStutzenstein/readdLastSpeakerFix 
Fixed readding last speaker
 2019-10-16 09:57:07 +02:00
FinnStutzenstein
d1048a0d9d Fixed readding last speaker 
It is not given, that null values are sorted last in the `order_by("-end_time")`
statement. This did not happens in the tests, but in a productive environment.
See https://docs.djangoproject.com/en/2.2/ref/models/querysets/#order-by for a
`.asc()`/`.desc()` option `nulls_last`. I choose another approach to just
exclude these values.
 2019-10-16 09:41:30 +02:00
Sean
595f9cd201
Merge pull request #5030 from tsiegleauq/date-pipe 
Add custom date pipe
 2019-10-16 09:23:01 +02:00
Sean
611c0bce45
Merge pull request #5062 from FinnStutzenstein/perf 
Use Proxies for ViewModels
 2019-10-16 09:22:00 +02:00
FinnStutzenstein
7af74fb07a Use Proxies for ViewModels 
Also reworked creation of assignments, motions and users.
 2019-10-16 09:11:02 +02:00
Finn Stutzenstein
7282c541dd
Merge pull request #5069 from jsangmeister/los-edit-mode 
Edit mode for List of Speakers
 2019-10-15 16:08:10 +03:00
jsangmeister
943e8f22d3 Adds sort mode, delete confirmation and re-add speaker button to list of 
speakers
 2019-10-15 14:58:04 +02:00
Finn Stutzenstein
4466e15343
Merge pull request #5074 from tsiegleauq/motion-detail-manual-cd 
use manual cd in motion detail
 2019-10-15 15:17:27 +03:00
Sean Engelhardt
4ba701663b use manual cd in motion detail 
Uses manual CD in motion detail
 2019-10-15 13:48:56 +02:00
Sean Engelhardt
04656950cb Add custom date pipe 
Adds a custom date pipe and use it on the projector
The date pipe accepts unix time, can automatically adjust date to the current language and supports custom formatting using "moment.js" formatting options

Also fixes a minor translate-tag error
 2019-10-15 12:20:22 +02:00
FinnStutzenstein
e4c4bc0aa0 Closing websocket connections to unknown urls 2019-10-15 10:54:31 +02:00
Sean
f9cea53659
Merge pull request #5041 from GabrielInTheWorld/reworkMotionCommands 
Separates the menu for multi-select of motions
 2019-10-14 12:48:41 +02:00