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

6089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
fae270a1d6 Make sure the cache is ensured before manipulating it 2019-02-04 17:41:18 +01:00
Emanuel Schütze
a6043ba8d5
Merge pull request #4251 from tsiegleauq/login-redirect-issues 
Allow reload on login children
 2019-02-04 15:30:52 +01:00
Sean Engelhardt
06bfa314cb Allow reload on login children 
Fixes a bug where the user was always redirected to
/login/ as unknown user, when they tried to
load children from login page from an external references.
 2019-02-04 15:17:03 +01:00
Sean
48b79ae24d
Merge pull request #4159 from CatoTH/Openslides3-Line-Highlighting 
Line highlighting
 2019-02-04 14:37:41 +01:00
Tobias Hößl
1bc17f2c6c Line highlighting 2019-02-04 13:17:24 +01:00
Emanuel Schütze
27ecb6f411
Merge pull request #4247 from emanuelschuetze/translation 
Updated translations
 2019-02-03 22:42:09 +01:00
Emanuel Schütze
a4fcc43121 Hotfix: Downgrade terser to 3.14.1 
see https://github.com/webpack-contrib/terser-webpack-plugin/issues/66
 2019-02-03 22:26:47 +01:00
Emanuel Schütze
ac96ba8d3a Updated translations 2019-02-03 22:12:26 +01:00
Finn Stutzenstein
fa63110889
Merge pull request #4150 from FinnStutzenstein/count-users 
count users via notify
 2019-02-02 10:45:52 +01:00
FinnStutzenstein
7ce1eb592f Count active users via notify (for admins only), absolute imports 2019-02-02 08:17:36 +01:00
Emanuel Schütze
768b97816f
Merge pull request #4211 from tsiegleauq/current-list-of-speakers 
Add current list of speakers to agenda-list
 2019-02-01 18:30:45 +01:00
Sean Engelhardt
0a7f905c21 Add current list of speakers to agenda-list 
Adds a current-list-of-speakers button to the agenda list view
The user may select a projector which will return an agenda item
which will be used to determine the CLOS
 2019-02-01 18:11:10 +01:00
Emanuel Schütze
f26f7f9c08
Merge pull request #4244 from MaximilianKrambach/callListPdf 
call list pdf export
 2019-02-01 18:04:48 +01:00
Emanuel Schütze
07a37cc243
Merge pull request #4236 from normanjaeckel/SetStateAllowSubmitterEdit 
Allow set state for submitters in some states.
 2019-02-01 17:56:31 +01:00
Maximilian Krambach
181d00ea94 call list pdf export 2019-02-01 17:48:29 +01:00
Emanuel Schütze
d4cc3c3720 Allow to set state as submitter in client. 2019-02-01 16:30:50 +01:00
Norman Jäckel
286c81e007 Allow set state for submitters in some states. 2019-02-01 16:10:51 +01:00
Emanuel Schütze
448ea6df28
Merge pull request #4235 from normanjaeckel/SubmitterPermissions 
Added new flag for states to hide motions from submitters.
 2019-02-01 16:08:51 +01:00
Norman Jäckel
c355326466 Added new flag to motion state to control access for different users. 2019-02-01 15:42:02 +01:00
Sean
e281b310a7
Merge pull request #4238 from MaximilianKrambach/historyNavigate 
navigate to detail view after setting the history mode
 2019-02-01 15:17:16 +01:00
Emanuel Schütze
7b840ca796
Merge pull request #4242 from tsiegleauq/motion-detail-ammendments 
Add amendment info in motion details
 2019-02-01 15:09:01 +01:00
Sean Engelhardt
01786f685c Add amendment info in motion details 
Alters motion detail to show amendments and to a given motion
and original motions to a given amendment.
Changes the motion PDF to show amendments.

Fixes a bug with the projection indicator
 2019-02-01 14:52:31 +01:00
Maximilian Krambach
ba6d3da8f0 navigate to detail view after setting the history mode 
(if a detailView is existant)
 2019-02-01 14:42:19 +01:00
Emanuel Schütze
dc1e48329f
Merge pull request #4241 from MaximilianKrambach/csvExport 
explicitly set mimetype for csv export
 2019-02-01 14:41:09 +01:00
Emanuel Schütze
3d7b833eeb Fix travis by downgrading pytest to <4.2.0 2019-02-01 14:28:34 +01:00
Maximilian Krambach
da722dd518 explicitly set mimetype for csv export 2019-02-01 14:20:00 +01:00
Sean
1b2258a4e5
Merge pull request #4239 from tsiegleauq/motion-detail-tags 
Add Tags into motion details
 2019-02-01 13:18:42 +01:00
Sean Engelhardt
f992b77d99 Add Tags into motion details 
Adds tags to motion repository,
view-motion and selectable for the motion detail view
 2019-02-01 12:34:42 +01:00
Finn Stutzenstein
f3c3d8ab8c
Merge pull request #4219 from FinnStutzenstein/cleanup 
A little bit of cleanup
 2019-02-01 11:16:35 +01:00
FinnStutzenstein
84974d7687 A little bit of cleanup 2019-02-01 11:02:24 +01:00
Finn Stutzenstein
6a60280172
Merge pull request #4229 from FinnStutzenstein/repositories 
Restructure the client, register Repositories and map to collection
 2019-02-01 10:42:51 +01:00
FinnStutzenstein
97f60c1e6c Restructure the client, register Repositories and map to collection 
strings.
 2019-02-01 10:19:17 +01:00
Emanuel Schütze
dbe452f976
Merge pull request #4232 from emanuelschuetze/reason 
New config to set reason field required.
 2019-02-01 10:15:02 +01:00
Emanuel Schütze
fa8e0687bf
Merge pull request #4237 from ostcar/fix_restricted_data_cache 
fix restricted_data_cache for elements that exists, but a user is not allowed to see them
 2019-02-01 10:13:53 +01:00
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
Emanuel Schütze
617eccb85f New config to set reason field required. 2019-02-01 09:53:38 +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
Oskar Hahn
1111a8074e fix restricted_data_cache for elements that exists, but a user is not allowed to see them 2019-02-01 08:26:34 +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