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

4869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
0086b513d0 Release 2.1 2017-03-29 14:33:00 +02:00
Emanuel Schütze
6d7f121a7f Merge pull request #3167 from emanuelschuetze/translations 
Updated final 2.1 translations for CS, ES, FR, PT, RU
 2017-03-29 14:30:02 +02:00
Emanuel Schütze
861e9674b8 Updated final 2.1 translations for CS, ES, FR, PT, RU 2017-03-29 14:25:02 +02:00
Emanuel Schütze
aceee09770 Merge pull request #3166 from normanjaeckel/CHANGELOG 
Rework on CHANGELOG.
 2017-03-29 13:56:36 +02:00
Norman Jäckel
aa718c9113 Rework on CHANGELOG. 2017-03-28 21:28:12 +02:00
Emanuel Schütze
bb74e7eaa9 Merge pull request #3165 from normanjaeckel/MotionCreateFix 
Fixed creating motion for users with comments permissions.
 2017-03-28 21:13:39 +02:00
Norman Jäckel
4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Emanuel Schütze
9e96db894c Merge pull request #3159 from FinnStutzenstein/Issue3140 
fixing validate_html and motion saving (fixes #3140)
 2017-03-28 19:44:52 +02:00
Emanuel Schütze
b162a1d43e Merge pull request #3164 from normanjaeckel/README 
Updated README.
 2017-03-28 19:43:20 +02:00
FinnStutzenstein
d9e3da87f5 fixing validate_html and motion saving (fixes #3140) 
using PATCH
 2017-03-28 19:39:06 +02:00
Norman Jäckel
2a72b52f8a Updated README. 2017-03-28 18:11:28 +02:00
Emanuel Schütze
ba4a408f5e Merge pull request #3156 from emanuelschuetze/issue-3099 
Disable edit button and hide remove button if election is finished.
 2017-03-28 14:47:09 +02:00
Emanuel Schütze
7ab95773eb Disable edit button and hide remove button if election is finished. (Fixed #3099) 2017-03-28 14:29:32 +02:00
Norman Jäckel
60b80f457c Merge pull request #3163 from emanuelschuetze/pdfmake-update 
Updated pdfmake to 0.1.27.
 2017-03-28 13:39:36 +02:00
Norman Jäckel
0ab2503fdc Merge pull request #3162 from FinnStutzenstein/assignmentOrder 
Fixing order for assignment poll form and translation for slide (fixe…
 2017-03-28 13:39:09 +02:00
Emanuel Schütze
b30e8c9641 Updated pdfmake to 0.1.27. 2017-03-28 10:50:29 +02:00
Emanuel Schütze
c4a4773074 Merge pull request #3157 from normanjaeckel/FixDeletedReferenceProjector 
Fixed bug when reference projector for list of speakers slide is dele…
 2017-03-28 10:06:12 +02:00
Emanuel Schütze
5bf7caa8f4 Merge pull request #3158 from normanjaeckel/DeleteFile 
Delete a file from filesystem when mediafile is deleted/destroied via…
 2017-03-28 09:59:21 +02:00
FinnStutzenstein
72ceac3510 Fixing order for assignment poll form and translation for slide (fixes #3160, fixes #3161) 2017-03-28 09:58:02 +02:00
Norman Jäckel
619fc29cd4 Delete a file from filesystem when mediafile is deleted/destroied via REST api. Fixed #3146. 2017-03-28 00:17:55 +02:00
Norman Jäckel
40c6957b21 Merge pull request #3122 from normanjaeckel/ExampleData 
Example data
 2017-03-27 23:54:51 +02:00
Norman Jäckel
d6af67d1df Fixed bug when reference projector for list of speakers slide is deleted. Fixed #3076. 2017-03-27 23:53:35 +02:00
Norman Jäckel
bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Norman Jäckel
9ffb008eb0 Merge pull request #3154 from emanuelschuetze/issue-3151 
Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151).
 2017-03-27 12:31:52 +02:00
Norman Jäckel
c741ddb909 Merge pull request #3155 from emanuelschuetze/issue3144 
Fixed wrong cancel function in mediafile form. (Fixed #3144)
 2017-03-27 12:25:24 +02:00
Norman Jäckel
473e48a9e5 Merge pull request #3149 from CatoTH/line-breaks-in-inline-diffs 
Line breaks in inline diffs
 2017-03-27 12:25:08 +02:00
Emanuel Schütze
f971696130 Fixed wrong cancel function in mediafile form. (Fixed #3144) 2017-03-27 11:19:06 +02:00
Emanuel Schütze
fa76cb2866 Fixed linebreaks in pdf. 2017-03-27 11:17:04 +02:00
Emanuel Schütze
461be41a64 Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151). 
To remove the 'contextmenu' plugin also the 'liststyle' and 'tabletools' plugins
have to removed.
 2017-03-27 10:09:27 +02:00
Tobias Hößl
0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Norman Jäckel
c8f64783bc Merge pull request #3063 from FinnStutzenstein/dev-guide 
Updateing the instructions for big mode
 2017-03-25 21:53:48 +01:00
FinnStutzenstein
100db66b8f Updated instructions 
Updated big mode and split up requiements_production

Some changes are made by normanjaeckel.
 2017-03-25 21:31:30 +01:00
Emanuel Schütze
e90266091f Merge pull request #3142 from CatoTH/bugfix-diff-regression 
Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe51…
 2017-03-25 12:26:21 +01:00
Tobias Hößl
d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel
33a61cb340 Merge pull request #3139 from emanuelschuetze/diff-mode-pdf 
Cleanup pdf parsing code for indentation fix in diff mode.
 2017-03-24 14:50:46 +01:00
Norman Jäckel
4964c2e84e Merge pull request #3138 from FinnStutzenstein/CountdownBug 
Fixing countdown default time
 2017-03-24 14:50:35 +01:00
Norman Jäckel
359ad0f60c Merge pull request #3137 from FinnStutzenstein/Issue3053 
watch for projector resolution change (fixes #3053)
 2017-03-24 14:47:09 +01:00
Norman Jäckel
85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103 
Improving creation of ballots (fixes #3103)
 2017-03-24 14:46:25 +01:00
Emanuel Schütze
9472eec69b Cleanup pdf parsing code for indentation fix in diff mode. 2017-03-24 09:35:13 +01:00
FinnStutzenstein
7eef45cd51 Fixing countdown default time 2017-03-24 09:23:28 +01:00
FinnStutzenstein
ab245b86a8 watch for projector resolution change (fixes #3053) 2017-03-24 08:46:18 +01:00
FinnStutzenstein
0220a03350 fixing test and inform_changed_data call 2017-03-24 08:14:08 +01:00
Norman Jäckel
5cd3b73725 Merge pull request #3135 from emanuelschuetze/projector-scroll-direction 
Switch projector scroll direction
 2017-03-23 23:24:02 +01:00
Norman Jäckel
e93a2f9f8e Merge pull request #3134 from normanjaeckel/IdentifierWahnsinn 
Fixed bug when creating multiple motions at once (problem with unique…
 2017-03-23 23:23:40 +01:00
Emanuel Schütze
57025b9792 Switch projector scroll direction 
- button 'arrow down': moves the visible part of the projector down
  (forward = text scrolls from bottom to top)
- button 'arrow up': moves the visible part of the projector up
  (backward = text scrolls from top to bottom)

Reverts change from #3094.
 2017-03-23 10:51:40 +01:00
Norman Jäckel
ced3f6d697 Fixed bug when creating multiple motions at once (problem with unique motion identifier). Fixed #3062. 2017-03-23 00:47:41 +01:00
Norman Jäckel
f34c24947a Merge pull request #3133 from emanuelschuetze/order-summary 
Fixed wrong order of change recommendations in summary box in PDF.
 2017-03-23 00:27:47 +01:00
Norman Jäckel
cd105f2271 Merge pull request #3132 from CatoTH/pdf-inline-diff-remove-extra-spaces 
Remove erroneous margin around inline diff paragraphs in PDF
 2017-03-23 00:27:27 +01:00
Norman Jäckel
5d074136be Merge pull request #3131 from tsiegleauq/change-reco-pdf-paragraphs 
adjust indentation for new insertions in PDF
 2017-03-23 00:26:25 +01:00
Emanuel Schütze
bd5ccb62ba Fixed wrong order of change recommendations in summary box in PDF. 2017-03-22 22:14:07 +01:00