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

5719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
9ae1d7e59a Show allert in sort template if agenda sort request failed. 2017-02-17 21:59:13 +01:00
Norman Jäckel
582915a019 Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector 
Send also motion.state.workflow to motion block slide.
 2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819 Send also motion.state.workflow to motion block slide. 
to show recommendation names in slide template
 2017-02-17 21:10:46 +01:00
Norman Jäckel
aa14ac99b3 Added check for hierarchical loops in agenda sort view. See #2972. 2017-02-17 17:20:30 +01:00
Norman Jäckel
56420aa0f5 Merge pull request #2982 from emanuelschuetze/recommendation-config 
Added new config for default change recommendation view.
 2017-02-17 16:33:36 +01:00
Norman Jäckel
935a2a7245 Merge pull request #2980 from emanuelschuetze/pdf-worker-fix 
Fixed placeholder replacement in pdf worker.
 2017-02-17 16:29:09 +01:00
Norman Jäckel
ee66ee3d72 Merge pull request #2979 from FinnStutzenstein/Issue2951 
fixing #2951
 2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate 
Fixing MotionBlock autoupdate and added projector button (fixes #2958)
 2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a Added new config for default change recommendation view. 
Use this default view for motion catalog pdf and motion detail view.
 2017-02-17 16:03:00 +01:00
Emanuel Schütze
a804362e16 Fixed placeholder replacement in pdf worker. 
Make it more dynamic by searching recursively.
 2017-02-17 15:11:28 +01:00
FinnStutzenstein
735dbcf109 Better dialog handling. Many fixes. 2017-02-17 14:58:35 +01:00
FinnStutzenstein
a5398a491c fixing #2951 2017-02-17 14:54:32 +01:00
Emanuel Schütze
9a1e45682c Merge pull request #2976 from FinnStutzenstein/templateFixes 
Update mediafile form
 2017-02-17 13:58:49 +01:00
FinnStutzenstein
0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Emanuel Schütze
0075c23225 Merge pull request #2977 from emanuelschuetze/issue2967 
Fixed margin-top of motion change recommendation line tooltip.
 2017-02-17 13:21:54 +01:00
Emanuel Schütze
09ae3c3425 Fixed margin-top of motion change recommendation tooltip (Fixed #2967). 2017-02-17 13:17:24 +01:00
Norman Jäckel
28a5c9ecaf Merge pull request #2974 from emanuelschuetze/pdf-layout 
Motion PDF improvements
 2017-02-17 13:11:15 +01:00
Norman Jäckel
21920fc11d Merge pull request #2975 from emanuelschuetze/fix-2960 
Fixed IntegrityError while creating groups with postgres (Fixed #2960).
 2017-02-17 13:10:28 +01:00
FinnStutzenstein
a765f5cb0e Update mediafile form 2017-02-17 12:43:50 +01:00
Emanuel Schütze
75949cb01c Fixed IntegrityError while creating groups with postgres (Fixed #2960). 
Use ng-submit for group form template.
 2017-02-17 12:06:07 +01:00
Emanuel Schütze
46f6bbb907 Motion PDF improvements 
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.

Added missing translation string.
 2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff Merge pull request #2891 from normanjaeckel/CamelCase 
Added support for CamelCase to RESTModelMixin. See #2480.
 2017-02-16 21:09:13 +01:00
Emanuel Schütze
d595e28d09 Merge pull request #2969 from CatoTH/Issue2961-bugfix 
Solving two bugs in the diff - for #2961
 2017-02-16 14:59:51 +01:00
Norman Jäckel
89192236fc Added support for CamelCase to RESTModelMixin. See #2480. 2017-02-16 13:31:57 +01:00
Emanuel Schütze
0da7765dc0 Merge pull request #2968 from normanjaeckel/StaticDir 
Fixed write settings command for Windows portable version. Fixed #2947.
 2017-02-15 22:57:05 +01:00
Emanuel Schütze
7a73b30189 More layout fixes for motion diff view slide. 
- Fixed wrong text order.
- Improved change summary box.
 2017-02-15 22:40:18 +01:00
Tobias Hößl
8029492d91 Bugfix: layout of diff view on the projector 2017-02-15 21:36:30 +01:00
Tobias Hößl
afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Emanuel Schütze
be342f752f Merge pull request #2966 from emanuelschuetze/issue2956 
Send only data to client which user is allowed to see (Fixed #2956).
 2017-02-15 20:18:45 +01:00
Emanuel Schütze
ae6496852e Merge pull request #2959 from emanuelschuetze/issue2954 
Added missing topic text to agenda csv export (Fixed #2954).
 2017-02-15 20:18:01 +01:00
Emanuel Schütze
b881c071ce Merge pull request #2953 from matakuka/ckeditor 
set ckeditor to fixed Version (fixes #2921)
 2017-02-15 20:16:49 +01:00
Norman Jäckel
1a53c7c3cc Fixed write settings command for Windows portable version. Fixed #2947. 2017-02-15 17:07:59 +01:00
Emanuel Schütze
3e92799838 Send only data to client which user is allowed to see (Fixed #2956). 
Fixed get_restricted_data functions for motion and mediafiles.
 2017-02-15 16:51:44 +01:00
Norman Jäckel
d3ba49d040 Merge pull request #2964 from tsiegleauq/issue2962-pdf-for-diff 
pdf w.o linen numbers and change rec. (fixes #2962)
 2017-02-15 16:41:07 +01:00
Emanuel Schütze
aa0791fc34 Added missing topic text to agenda csv export (Fixed #2954). 2017-02-15 14:46:25 +01:00
Sean Engelhardt
4eefde839b pdf w.o linen numbers and change rec. (fixes #2962) 2017-02-15 14:23:28 +01:00
Maximilian Krambach
c5aedc977a set ckeditor to fixed Version (fixes #2921) 2017-02-13 16:34:34 +01:00
Emanuel Schütze
802e253621 Merge pull request #2950 from ostcar/fix_2835 
Let CollectionElement fail early
 2017-02-13 13:45:14 +01:00
Oskar Hahn
26b7f2879c Let CollectionElement fail early 
Fixes #2835
Fixes #2904
 2017-02-12 14:15:58 +01:00
Emanuel Schütze
0a1f4ffc1d Merge pull request #2946 from emanuelschuetze/release-2.1b3 
Release 2.1b3
 2017-02-10 23:58:55 +01:00
Emanuel Schütze
1c79e2c8ee Update version to 2.1b4-dev 2017-02-10 23:40:18 +01:00
Emanuel Schütze
2aae6d43eb Release 2.1b3 2017-02-10 23:39:52 +01:00
Emanuel Schütze
75fa1fdb7b Merge pull request #2945 from emanuelschuetze/assignment-projector-fix 
Fixed outdated assignment phases variable in projetor.js.
 2017-02-10 23:36:15 +01:00
Emanuel Schütze
5a5cba1422 Merge pull request #2944 from emanuelschuetze/translations 
Updated German translations.
 2017-02-10 23:34:37 +01:00
Emanuel Schütze
67b5b4ca32 Updated German translations. 2017-02-10 23:28:38 +01:00
Emanuel Schütze
41b30d70b6 Fixed outdated assignment phases variable in projetor.js. 
Removed wrong translation string.
 2017-02-10 23:26:38 +01:00
Emanuel Schütze
da61aac89a Merge pull request #2943 from emanuelschuetze/issue2865 
New full text search on client-side (Fixed #2865).
 2017-02-10 23:05:15 +01:00
Emanuel Schütze
1230f4a29a New full text search on client-side (Fixed #2865). 
Removed server-side search by whoosh.
 2017-02-10 22:52:08 +01:00
Emanuel Schütze
09c152cff8 Merge pull request #2940 from emanuelschuetze/requirements 
Updated requirements.
 2017-02-10 21:24:00 +01:00
Emanuel Schütze
311b134d81 Merge pull request #2939 from FinnStutzenstein/Encoding 
Added UTF-8 byte order mark for csv export
 2017-02-10 21:23:09 +01:00