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

4238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
FinnStutzenstein
e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
FinnStutzenstein
4530a5faed Use ckeditor in config 2017-01-07 14:45:58 +01:00
Emanuel Schütze
206a624f04 Added missing CHANGELOG entries (Fixes #2415). 2017-01-06 22:23:24 +01:00
Emanuel Schütze
f4d468a6f6 Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS. 
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
 2017-01-06 21:38:08 +01:00
Emanuel Schütze
11c0b0cc3f Merge pull request #2816 from FinnStutzenstein/Issue2127 
Use ckeditor to edit projector messages
 2017-01-06 21:28:48 +01:00
FinnStutzenstein
c3fc7d0f1b Do not project more than one message 2017-01-06 19:48:37 +01:00
Norman Jäckel
da66db7bec Merge pull request #2819 from FinnStutzenstein/Issue2661 
disable edit button if it is not possible to edit
 2017-01-06 16:55:55 +01:00
Norman Jäckel
2b5f490a0f Merge pull request #2817 from emanuelschuetze/license 
Updated license to 2017
 2017-01-06 16:53:03 +01:00
FinnStutzenstein
6e7321d2a3 disable edit button if it is not possible to edit 2017-01-06 14:51:27 +01:00
FinnStutzenstein
f37ad0f6c3 Use ckeditor to edit projector messages 2017-01-06 12:45:30 +01:00
Emanuel Schütze
01f3cf903a Updated license to 2017 2017-01-06 12:06:27 +01:00
Emanuel Schütze
f146e11354 Merge pull request #2808 from matakuka/ballot_count 
print correct number of ballots (closes #2504)
 2017-01-06 11:56:29 +01:00
Maximilian Krambach
a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
Emanuel Schütze
f865ba91b5 Merge pull request #2815 from emanuelschuetze/missing-ckeditor-plugins 
Install missing plugins for ckeditor.
 2017-01-06 11:36:29 +01:00
Emanuel Schütze
cc0c0bf0d4 Merge pull request #2783 from FinnStutzenstein/PapaParse 
New csv import using PapaParse
 2017-01-06 11:33:06 +01:00
Emanuel Schütze
df4aeb4518 Install missing plugins for ckeditor. 2017-01-06 11:08:32 +01:00
Norman Jäckel
c12d985ab6 Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf 
Add QR code in user access list pdf (fixes #2665)
 2017-01-06 11:08:22 +01:00
Norman Jäckel
85298554a3 Merge pull request #2807 from matakuka/mediafile_project_2706 
Bind mediafile to projector scope (fixes #2706)
 2017-01-06 11:05:33 +01:00
FinnStutzenstein
f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00