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

4257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
acab868c79 Quickfix for #2865. The problem is not completely solved. 2017-01-14 17:15:30 +01:00
Norman Jäckel
aefd5073a7 Skipped autoupdate for user during login. See #2804. 2017-01-14 16:45:14 +01:00
Norman Jäckel
286119108c Merge pull request #2860 from FinnStutzenstein/Issue2852 
adding permission checks
 2017-01-14 15:12:19 +01:00
Norman Jäckel
3600dd58f0 Merge pull request #2858 from emanuelschuetze/issue2142 
Assignment list: Used number of candidates, removed number of needed …
 2017-01-14 15:11:21 +01:00
Norman Jäckel
a8fd42f26b Merge pull request #2857 from emanuelschuetze/issue2828 
Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828).
 2017-01-14 15:10:50 +01:00
Emanuel Schütze
527f949968 Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142) 2017-01-14 12:55:51 +01:00
Emanuel Schütze
d76162e3b0 Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828). 2017-01-14 12:46:23 +01:00
FinnStutzenstein
794db79511 adding permission checks 2017-01-14 12:13:38 +01:00
Emanuel Schütze
458a7cf7c4 Merge pull request #2846 from normanjaeckel/MotionBlockSecu 
Fixed motion create view. Fixed #2506.
 2017-01-14 12:10:51 +01:00
Emanuel Schütze
8c4b38f018 Merge pull request #2847 from FinnStutzenstein/Issue2844 
Group order and hide internal items filter
 2017-01-14 11:39:51 +01:00
Emanuel Schütze
8c9bde27fb Merge pull request #2853 from normanjaeckel/ManagePy 
Added error message for unknown args. Fixed #2200.
 2017-01-14 11:39:17 +01:00
Norman Jäckel
a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
FinnStutzenstein
f092d6670d Group order, hide internal items filter, hide comment in agenda list view 2017-01-14 10:51:07 +01:00
Norman Jäckel
aa47ecbf8a Added error message for unknown args. Fixed #2200. 2017-01-14 10:48:41 +01:00
Emanuel Schütze
99a771ac6c Merge pull request #2845 from FinnStutzenstein/Issue2833 
Fixing user list view with restricted permissions (closes #2833)
 2017-01-14 10:47:12 +01:00
Norman Jäckel
663feff806 Merge pull request #2848 from emanuelschuetze/issue2421 
Added text to empty assignment poll result slide (Fixed #2421)
 2017-01-14 10:41:24 +01:00
Emanuel Schütze
35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838 
Fixing #2838
 2017-01-14 10:40:57 +01:00
Emanuel Schütze
113aac59b3 Added text to empty assignment poll result slide (Fixed #2421) 2017-01-14 10:21:19 +01:00
FinnStutzenstein
76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
FinnStutzenstein
c0f092d811 Fixing user list view with restricted permissions (closes #2833) 2017-01-14 09:57:45 +01:00
Norman Jäckel
d22dff2743 Merge pull request #2841 from flanagan/remove-summary 
Removed recommendation motion summary on slide.
 2017-01-13 21:32:50 +01:00
Norman Jäckel
6d82208fb0 Merge pull request #2840 from ostcar/fix_channels 
Fix channels
 2017-01-13 21:31:58 +01:00
Meinert Leinigen
d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +01:00
Oskar Hahn
1dc671430a Fix channels 2017-01-13 20:53:06 +01:00
Norman Jäckel
717d346321 Merge pull request #2794 from ostcar/group_cache 
Group cache
 2017-01-13 13:58:40 +01:00
Oskar Hahn
728576d514 Performance improvements 
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
 2017-01-13 13:37:18 +01:00
Norman Jäckel
299811b4a5 Merge pull request #2834 from emanuelschuetze/channels 
Upgrade to channels 1.x (Fixes #2829).
 2017-01-13 12:18:44 +01:00
Emanuel Schütze
aca97da9c6 Merge pull request #2837 from emanuelschuetze/dockerfile 
Use gulp production mode in docker images.
 2017-01-12 15:56:27 +01:00
Emanuel Schütze
c15ae4bbf9 Use gulp production mode in docker images. 2017-01-12 15:45:15 +01:00
Emanuel Schütze
fb24ca0aba Merge pull request #2813 from FinnStutzenstein/MotionCommentInline 
Motion comments inline editing
 2017-01-11 21:48:02 +01:00
FinnStutzenstein
b44b58393d Motion comments inline editing 2017-01-11 20:59:50 +01:00
Norman Jäckel
4a935bb641 Merge pull request #2836 from emanuelschuetze/createusercommand 
Added groups_id to createopenslides user command.
 2017-01-11 14:49:33 +01:00
Emanuel Schütze
a6807d77bf Added groups_id to management command 'createopenslidesuser'. 2017-01-11 13:46:56 +01:00
Emanuel Schütze
e436981ef4 Upgrade to channels 1.x (Fixes #2829). 2017-01-11 13:34:21 +01:00
Emanuel Schütze
962c06c85f Merge pull request #2820 from FinnStutzenstein/Issue2667 
Change user import table
 2017-01-10 21:22:39 +01:00
Norman Jäckel
8e385199d5 Merge pull request #2826 from FinnStutzenstein/Issue2805 
Do not enable inline editing for non privileged users
 2017-01-10 21:13:52 +01:00
Norman Jäckel
c5ec87612c Merge pull request #2830 from ostcar/missing_ids 
Change the way that missing cache ids are found.
 2017-01-10 21:10:59 +01:00
Oskar Hahn
97b21427aa Change the way that missing cache ids are found. 
This is probalby faster but in any way it maks debugging a lot easier. To go though
a big list in a for-loop is no fun at all.
 2017-01-10 20:50:44 +01:00
FinnStutzenstein
cf7033e033 Do not enable inline editing for non privileged users 2017-01-09 16:03:09 +01:00
Norman Jäckel
1eb9236a76 Merge pull request #2824 from emanuelschuetze/pdfmake0.1.23 
Set pdfmake to 0.1.23 (0.1.24 does not work for custom fonts).
 2017-01-09 15:04:54 +01:00
Emanuel Schütze
17b951058b Merge pull request #2821 from emanuelschuetze/no-amendments 
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
 2017-01-09 14:33:57 +01:00
Emanuel Schütze
bd090d3aaf Set pdfmake to 0.1.23 (0.1.24 does not work for custom fonts). 2017-01-09 14:30:53 +01:00
Emanuel Schütze
41124a53ca Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS. 
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
 2017-01-09 14:25:28 +01:00
FinnStutzenstein
a9fbbb522e Change user import table 2017-01-09 14:22:32 +01:00
Norman Jäckel
58d8f68cc5 Merge pull request #2814 from FinnStutzenstein/ConfigEditor 
Use ckeditor in config
 2017-01-09 14:19:32 +01:00
Emanuel Schütze
6502f36a90 Merge pull request #2796 from FinnStutzenstein/Issue2548 
Project change recommendations
 2017-01-09 09:27:46 +01:00
Norman Jäckel
1a88f0985a Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks 
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
 2017-01-08 13:43:20 +01:00
Norman Jäckel
726dbc2ec6 Merge pull request #2822 from emanuelschuetze/changelog-2415 
Added missing CHANGELOG entries (Fixes #2415).
 2017-01-08 10:46:44 +01:00
Norman Jäckel
6c7d53e852 Merge pull request #2823 from ostcar/test_python_3.6 
Test openslides with python 3.6 with travis
 2017-01-08 10:45:58 +01:00
Oskar Hahn
66f7cba313 Test openslides with python 3.6 with travis 2017-01-07 16:36:27 +01:00