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

4218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Emanuel Schütze
388e6353cc Show qr codes in access data pdf only if config fields are set. 
Disable footer with page numbers.
 2017-01-04 22:43:17 +01:00
Sean Engelhardt
9abf9d5d57 Add QR codes to access data list (fixes #2665) 2017-01-04 15:50:20 +01:00
Emanuel Schütze
85c70b27f5 Merge pull request #2809 from tsiegleauq/pdfmake-0.1.23 
use pdfmake release 0.1.23
 2017-01-04 15:38:21 +01:00
Sean Engelhardt
c16a533da7 use pdfmake release 0.1.23 2017-01-04 12:01:29 +01:00
Maximilian Krambach
912dc1af8f Bind mediafile to projector scope (fixes #2706) 2016-12-29 11:37:56 +01:00
Norman Jäckel
5fe902afed Merge pull request #2806 from fwolfst/README-IMPROVEMENTS 
Minor README improvements / typo fixes.
 2016-12-27 13:04:21 +01:00
Felix Wolfsteller
41a9424966 Minor README improvements / typo fixes. 2016-12-27 11:18:23 +01:00
Norman Jäckel
900ddaabb3 Merge pull request #2803 from emanuelschuetze/participant-number2 
Added "No." for participant number in get_full_name().
 2016-12-21 12:33:12 +01:00
Emanuel Schütze
c79e779934 Added "No." for participant number in get_full_name(). 2016-12-21 12:08:37 +01:00
Norman Jäckel
7b0dca84d2 Merge pull request #2801 from FinnStutzenstein/Issue2754 
More select mode options for users
 2016-12-21 11:57:20 +01:00
Norman Jäckel
286643ddd2 Merge pull request #2797 from FinnStutzenstein/Issue2653 
projector language (closes #2653)
 2016-12-21 11:55:49 +01:00
Norman Jäckel
bfa0b4b3fe Merge pull request #2800 from FinnStutzenstein/Issue2748 
Consistent time handling and generic time converter code
 2016-12-21 11:52:47 +01:00
FinnStutzenstein
365c122edd More select mode options for users 2016-12-21 10:42:34 +01:00
FinnStutzenstein
f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
Norman Jäckel
7d64ad98a4 Merge pull request #2802 from emanuelschuetze/participant-number 
Move participant number to the end of get_full_name().
 2016-12-21 10:33:45 +01:00
FinnStutzenstein
6454853bf6 Consistent time handling and generic time converter code 2016-12-21 10:09:27 +01:00
Emanuel Schütze
be66a26353 Move participant number to the end of get_full_name(). 2016-12-21 08:59:50 +01:00
Emanuel Schütze
c6fb710fb9 Merge pull request #2799 from normanjaeckel/ChangeChangelog 
Updated CHANGELOG.
 2016-12-20 08:48:42 +01:00
Norman Jäckel
3abb6aaaa0 Updated CHANGELOG. 2016-12-19 23:35:00 +01:00
Emanuel Schütze
16ff9200a9 Merge pull request #2782 from FinnStutzenstein/AssignmentSort 
Sort candidates in assignments
 2016-12-19 19:47:38 +01:00