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

4935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Emanuel Schütze
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
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
Norman Jäckel
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
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
a1ff04b862 Merge pull request #2938 from emanuelschuetze/translations 
Updated German translations.
 2017-02-07 09:23:32 +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
Norman Jäckel
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
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
Norman Jäckel
45c3da22f9 Merge pull request #2928 from emanuelschuetze/template-style 
Template style improvements and motion block fix
 2017-02-03 13:09:32 +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
Emanuel Schütze
df6605e759 Merge pull request #2925 from normanjaeckel/AgendaSort 
Added server side sort view for agenda items. See #2452.
 2017-02-01 17:50:58 +01:00
Norman Jäckel
8c53b53a9d Added server side sort view for agenda items. See #2452. 2017-02-01 14:23:59 +01:00
Emanuel Schütze
bcff33330c Merge pull request #2922 from normanjaeckel/Console 
Removed console.log call.
 2017-02-01 13:36:00 +01:00
Norman Jäckel
9ff9ac92be Removed console.log call. 2017-02-01 12:55:26 +01:00
Norman Jäckel
b6db7d481b Merge pull request #2895 from FinnStutzenstein/Issue2885 
Possibility to send extra startup data (closes #2885)
 2017-02-01 11:45:21 +01:00
Norman Jäckel
7d2a037567 Merge pull request #2918 from FinnStutzenstein/Issue2842 
Show config save status (closes #2842)
 2017-02-01 11:44:40 +01:00