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
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
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
b881c071ce
Merge pull request #2953 from matakuka/ckeditor
...
set ckeditor to fixed Version (fixes #2921 )
2017-02-15 20:16:49 +01:00
1a53c7c3cc
Fixed write settings command for Windows portable version. Fixed #2947 .
2017-02-15 17:07:59 +01:00
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
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
aa0791fc34
Added missing topic text to agenda csv export ( Fixed #2954 ).
2017-02-15 14:46:25 +01:00
4eefde839b
pdf w.o linen numbers and change rec. ( fixes #2962 )
2017-02-15 14:23:28 +01:00
c5aedc977a
set ckeditor to fixed Version ( fixes #2921 )
2017-02-13 16:34:34 +01:00
802e253621
Merge pull request #2950 from ostcar/fix_2835
...
Let CollectionElement fail early
2017-02-13 13:45:14 +01:00
26b7f2879c
Let CollectionElement fail early
...
Fixes #2835
Fixes #2904
2017-02-12 14:15:58 +01:00
0a1f4ffc1d
Merge pull request #2946 from emanuelschuetze/release-2.1b3
...
Release 2.1b3
2017-02-10 23:58:55 +01:00
1c79e2c8ee
Update version to 2.1b4-dev
2017-02-10 23:40:18 +01:00
2aae6d43eb
Release 2.1b3
2017-02-10 23:39:52 +01:00
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
5a5cba1422
Merge pull request #2944 from emanuelschuetze/translations
...
Updated German translations.
2017-02-10 23:34:37 +01:00
67b5b4ca32
Updated German translations.
2017-02-10 23:28:38 +01:00
41b30d70b6
Fixed outdated assignment phases variable in projetor.js.
...
Removed wrong translation string.
2017-02-10 23:26:38 +01:00
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
1230f4a29a
New full text search on client-side ( Fixed #2865 ).
...
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
09c152cff8
Merge pull request #2940 from emanuelschuetze/requirements
...
Updated requirements.
2017-02-10 21:24:00 +01:00
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
a9af6512b9
Updated requirements.
...
Channel uses now latest twisted 16.6.0 which requires MS Visual C++
2015 build tools on Windows.
2017-02-10 21:17:56 +01:00
30a3382bd1
Added UTF-8 byte order mark for csv export and global csv separator config
2017-02-10 20:47:57 +01:00
97de8cf785
Merge pull request #2942 from FinnStutzenstein/Issue2864
...
check if startup promise is resolved
2017-02-10 14:25:19 +01:00
cfdaabd18a
Merge pull request #2941 from FinnStutzenstein/CsvImport
...
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 14:24:36 +01:00
8f613177cb
check if startup promise is resolved
2017-02-10 10:23:46 +01:00
b73c50a4f9
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 09:11:45 +01:00
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
3c36cd5757
Reorganize the current list of speakers. Fixes #2669 and find()-calls.
2017-02-07 12:24:54 +01:00
eb0d34d212
Merge pull request #2937 from FinnStutzenstein/Issue2560
...
Inline edit the ballot description (closes #2560 )
2017-02-07 12:00:56 +01:00
38279f4895
Inline edit the ballot description ( closes #2560 )
2017-02-07 11:53:09 +01:00
a1ff04b862
Merge pull request #2938 from emanuelschuetze/translations
...
Updated German translations.
2017-02-07 09:23:32 +01:00
b4eff0ea1a
Updated German translations.
2017-02-07 09:16:12 +01:00
f66e551eaa
Merge pull request #2936 from FinnStutzenstein/MotionReason
...
Set resaon on save with CKEditor (fixes #2934 )
2017-02-06 17:29:09 +01:00
bacadd6931
Set resaon on save with CKEditor ( fixes #2934 )
2017-02-06 14:50:51 +01:00
12b50a0d68
Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle
...
PDF Layout improvements
2017-02-06 14:44:06 +01:00
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
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
04fd7c1816
Merge pull request #2930 from emanuelschuetze/fix-wordwrap
...
Fix word-wrap for long motion identifier in Firefox.
2017-02-06 14:11:54 +01:00
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
341916123c
Fix word-wrap for long motion identifier in Firefox.
2017-02-03 14:02:36 +01:00
45c3da22f9
Merge pull request #2928 from emanuelschuetze/template-style
...
Template style improvements and motion block fix
2017-02-03 13:09:32 +01:00
3ca254c88e
Show/hide internal items in agenda sort view.
2017-02-03 12:50:57 +01:00
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
bbd8782c4c
Fix 'follow recommendation for all motions' function.
...
in motion block detail view
2017-02-03 12:50:52 +01:00
6f05fc09ce
Merge pull request #2929 from FinnStutzenstein/Issue2927
...
Fixing merge conflicts (fixes #2927 )
2017-02-03 11:54:21 +01:00
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
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
Emanuel Schütze