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

3100 Commits

Author SHA1 Message Date
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
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
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
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
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
Oskar Hahn
26b7f2879c Let CollectionElement fail early 
Fixes #2835
Fixes #2904
 2017-02-12 14:15:58 +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
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
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
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
FinnStutzenstein
30a3382bd1 Added UTF-8 byte order mark for csv export and global csv separator config 2017-02-10 20:47:57 +01:00
Norman Jäckel
97de8cf785 Merge pull request #2942 from FinnStutzenstein/Issue2864 
check if startup promise is resolved
 2017-02-10 14:25:19 +01:00
FinnStutzenstein
8f613177cb check if startup promise is resolved 2017-02-10 10:23:46 +01:00
FinnStutzenstein
b73c50a4f9 Fixed missing <p> tags for motion import and some improvements. 2017-02-10 09:11:45 +01:00
Norman Jäckel
160333beea Merge pull request #2931 from FinnStutzenstein/Issue2669 
Reorganize the current list of speakers. Fixes #2669 and find()-calls
 2017-02-09 20:06:43 +01:00
FinnStutzenstein
3c36cd5757 Reorganize the current list of speakers. Fixes #2669 and find()-calls. 2017-02-07 12:24:54 +01:00
Emanuel Schütze
eb0d34d212 Merge pull request #2937 from FinnStutzenstein/Issue2560 
Inline edit the ballot description (closes #2560)
 2017-02-07 12:00:56 +01:00
FinnStutzenstein
38279f4895 Inline edit the ballot description (closes #2560) 2017-02-07 11:53:09 +01:00
Emanuel Schütze
b4eff0ea1a Updated German translations. 2017-02-07 09:16:12 +01:00
Emanuel Schütze
f66e551eaa Merge pull request #2936 from FinnStutzenstein/MotionReason 
Set resaon on save with CKEditor (fixes #2934)
 2017-02-06 17:29:09 +01:00
FinnStutzenstein
bacadd6931 Set resaon on save with CKEditor (fixes #2934) 2017-02-06 14:50:51 +01:00
Emanuel Schütze
12b50a0d68 Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle 
PDF Layout improvements
 2017-02-06 14:44:06 +01:00
Norman Jäckel
2e410599bb Merge pull request #2932 from emanuelschuetze/fix-category-numbering 
Fixed motion numbering in category sort view.
 2017-02-06 14:29:19 +01:00
Emanuel Schütze
80b9ce138f PDF Layout improvements 
- Added parent motion into subtitle of motion pdf.
  (for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
 2017-02-06 14:22:13 +01:00
Emanuel Schütze
f238125a23 Fixed motion numbering in category sort view. 
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
 2017-02-06 12:11:50 +01:00
Emanuel Schütze
341916123c Fix word-wrap for long motion identifier in Firefox. 2017-02-03 14:02:36 +01:00
Emanuel Schütze
3ca254c88e Show/hide internal items in agenda sort view. 2017-02-03 12:50:57 +01:00
Emanuel Schütze
e7ee8fbc07 Fixed some minor template styles. 
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
 2017-02-03 12:50:57 +01:00
Emanuel Schütze
bbd8782c4c Fix 'follow recommendation for all motions' function. 
in motion block detail view
 2017-02-03 12:50:52 +01:00
Norman Jäckel
6f05fc09ce Merge pull request #2929 from FinnStutzenstein/Issue2927 
Fixing merge conflicts (fixes #2927)
 2017-02-03 11:54:21 +01:00
Norman Jäckel
aade91cead Merge pull request #2926 from emanuelschuetze/issue-2923 
Fixed dynamic pdf header and footer for worker (Fixed #2923).
 2017-02-03 11:53:34 +01:00
Emanuel Schütze
3d60238ce1 Fixed dynamic pdf header/footer and table border (Fixed #2923). 
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
 2017-02-03 11:33:46 +01:00
FinnStutzenstein
4bc9a26c4c Fixing merge conflicts (fixes #2927) 2017-02-03 08:40:48 +01:00