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

6053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Finn Stutzenstein
44bc03b300
Merge pull request #4231 from tsiegleauq/enter-custom-translations 
Add custom translation settings
 2019-02-01 10:11:00 +01:00
Finn Stutzenstein
44851af172
Merge pull request #4227 from FinnStutzenstein/clos 
Projector reference for CLOS
 2019-02-01 10:10:47 +01:00
Sean Engelhardt
8016827242 Add custom translation settings 2019-02-01 09:51:18 +01:00
FinnStutzenstein
582d4d7c4a Projector reference for CLOS 2019-02-01 09:47:59 +01:00
Norman Jäckel
7b4ea753c1
Merge pull request #4234 from emanuelschuetze/https 
Set use_https to true
 2019-01-31 23:43:20 +01:00
Emanuel Schütze
b480266dad Set use_https to true 
used for password reset urls in emails by django
 2019-01-31 22:41:08 +01:00
Sean
c00b1a8325
Merge pull request #4221 from FinnStutzenstein/client-projector 
projector cleanup
 2019-01-31 19:03:13 +01:00
Emanuel Schütze
13b6acf72e
Merge pull request #4230 from MaximilianKrambach/translateSort 
wrong translation string
 2019-01-31 18:32:08 +01:00
Maximilian Krambach
15ce789617 wrong translation string 2019-01-31 17:16:30 +01:00
Emanuel Schütze
6e09a8819d
Merge pull request #4224 from MaximilianKrambach/statuteImportExport 
import/export for statutes
 2019-01-31 14:18:36 +01:00
Emanuel Schütze
a3d8a8aee6
Merge pull request #4228 from emanuelschuetze/ui 
UI improvements for motions
 2019-01-31 14:18:20 +01:00
Maximilian Krambach
04cbfe383d import/export for statutes 2019-01-31 14:10:39 +01:00
Emanuel Schütze
effd82eb75 UI improvements for motions 2019-01-31 12:49:00 +01:00
FinnStutzenstein
b921b771d6 projector cleanup 2019-01-31 12:41:04 +01:00
Emanuel Schütze
9c6a21469b
Merge pull request #4215 from GabrielInTheWorld/theming 
OpenSlides Theming
 2019-01-31 12:30:11 +01:00
Emanuel Schütze
df7fbfee67
Merge pull request #4225 from tsiegleauq/sort-group-matrix 
Sort groups by power
 2019-01-31 12:27:49 +01:00
Sean
9136b53d48
Merge pull request #4226 from MaximilianKrambach/workflowfilter 
only show motion workflow filter for config-enabled workflows
 2019-01-31 12:19:31 +01:00
Sean
8f4dddf495
Merge pull request #4223 from FinnStutzenstein/default-group-nav 
Fixed operator respecting the default group
 2019-01-31 12:07:56 +01:00
Maximilian Krambach
271d8cbfa4 only show motion workflow filter for config-enabled workflows 2019-01-31 12:05:50 +01:00
GabrielMeyer
30535dd21f OpenSlides theming (Fixes #4205) 
using 3 built-in themes (default, dark, green)
 2019-01-31 12:04:35 +01:00
Sean Engelhardt
9e477250b0 Sort groups by power 2019-01-31 12:03:59 +01:00
Emanuel Schütze
8cbcd6a5b5
Merge pull request #4220 from tsiegleauq/rec-giver-in-pdf 
Add motion reco giver to motion PDF
 2019-01-31 11:53:26 +01:00
Emanuel Schütze
b8fb95e878
Merge pull request #4000 from FinnStutzenstein/translations 
use own translation service wrapper
 2019-01-31 11:30:18 +01:00
Emanuel Schütze
c2107b77ab
Merge pull request #4222 from tsiegleauq/remove-login-snackbar 
Add login notice as div
 2019-01-31 11:26:42 +01:00
FinnStutzenstein
a53e0f27e6 Fixed operator respecting the default group 2019-01-31 11:15:21 +01:00
FinnStutzenstein
d20f8d6f44 Use own translation service wrapper for using custom translations 2019-01-31 10:42:44 +01:00
Sean Engelhardt
92fab5102a Add loginNotice as div 
Remove the snackbar, restructure the template code for login mask
and adds a div with the login notice
 2019-01-31 10:33:37 +01:00
Sean Engelhardt
f22b81d7ad Add motion reco giver to motion PDF 
Adds the text from "motion recommendet by"
into the motion PDF for both normal
motions and "StatuteAmendments"
 2019-01-31 10:15:45 +01:00
Sean
eb21ae0136
Merge pull request #4214 from tsiegleauq/angular722 
Update to angular 7.2.2
 2019-01-31 09:54:24 +01:00
Emanuel Schütze
d6ce448672
Merge pull request #4218 from emanuelschuetze/translations 
Updated translations
 2019-01-31 09:35:11 +01:00
Emanuel Schütze
9629c6d1fd Updated translations 2019-01-31 09:20:20 +01:00
Sean
d705b2a137
Merge pull request #4210 from MaximilianKrambach/agendalistpdf 
agenda pdf export
 2019-01-30 16:25:54 +01:00
Maximilian Krambach
167ef72bb6 agenda pdf export 2019-01-30 16:13:56 +01:00
Sean Engelhardt
b5ea837e0a Update to angular 7.2.2 
- updates the dependancien in package.json
- Angular is now compatible with current typescript
- Jasmine/Karma supports LazyLoading again
 2019-01-30 12:54:25 +01:00
Sean
ec8fa3eb91
Merge pull request #4212 from MaximilianKrambach/travisfixes 
Fix travis errors
 2019-01-30 12:29:22 +01:00
Maximilian Krambach
10d1209da8 Fix 'errors' 
- two python comparisons error not passing flake8 anymore
- typescript not being able to recognize an object, sending it prechewed
 2019-01-30 12:18:59 +01:00
Emanuel Schütze
625de1aeb4
Merge pull request #4207 from MaximilianKrambach/stringFilter 
acknowledge string filter
 2019-01-29 19:49:59 +01:00
Emanuel Schütze
e0177893aa
Merge pull request #4195 from MaximilianKrambach/userPdf 
user pdf exports: participant lists, access data
 2019-01-29 19:49:07 +01:00
Maximilian Krambach
6b0f129067 user pdf exports: participant lists, access data 2019-01-29 18:52:40 +01:00
Maximilian Krambach
6a969883ad acknowledge string filter 
- display correct number of show entries
- all bulk actions should only apply to filtered data
- fix user group filter
 2019-01-29 18:49:13 +01:00
Sean
00b15228f7
Merge pull request #4062 from FinnStutzenstein/modified-final-version 
Modified final version
 2019-01-29 18:31:38 +01:00
FinnStutzenstein
d6fcef79c0 modified final version 2019-01-29 18:15:48 +01:00
Emanuel Schütze
a1dc92bf0a
Merge pull request #4187 from FinnStutzenstein/client-projector 
more work on projector, countdowns, clos
 2019-01-29 16:43:24 +01:00
Sean
aa58572709
Merge pull request #4209 from GabrielInTheWorld/fix-4116 
Fixes #4116
 2019-01-29 16:26:15 +01:00
Emanuel Schütze
42f8b74d8e Projector templates 
- Projector base template
- Projection button
- projection dialog
- motion slide (template and motions/projector.py)
- user slide (template and users/projector.py)
- motion and user list view with projector column permission check.
 2019-01-29 16:12:19 +01:00
FinnStutzenstein
965d23be50 more work on projector, countdowns, clos 
- splitted clos-slide and clos-overlay.
- Synchronize to server, more little changes
 2019-01-29 16:10:21 +01:00
Emanuel Schütze
c52b82e77d
Merge pull request #4188 from MaximilianKrambach/hierarchicAgenda 
agenda hierarchies
 2019-01-29 16:08:03 +01:00
GabrielMeyer
a1bc0290ed Fixes #4116 
- Added config to prevent closing the dialog (except by clicking the
'cancel'-button of course)
- Changed property 'width' of the motion-detail-card, so the size will be
adjusted automatically.
 2019-01-29 15:25:01 +01:00
Sean
1bee3aa509
Merge pull request #4197 from MaximilianKrambach/optionalCategoryPrefix 
category prefix is currently optional
 2019-01-29 15:01:40 +01:00
Maximilian Krambach
064a3f7d3c agenda hierarchy tree 2019-01-29 15:00:18 +01:00