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

5340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
c4ec26c4c0 User without permission to see users can now see some required users. 
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
 2017-04-11 17:10:49 +02:00
Emanuel Schütze
3de4a2af1c Fixed empty motion comment field in motion update form. 
Motion comment values were not extracted. Concerns edit button in
motion list view only.
 2017-04-11 17:08:19 +02:00
Emanuel Schütze
152585a73f Merge pull request #3193 from emanuelschuetze/sortLastSpeakers 
Fixed sorting of last speakers.
 2017-04-11 17:06:25 +02:00
Emanuel Schütze
23fec417f8 Fixed sorting of last speakers. 2017-04-11 15:55:45 +02:00
Norman Jäckel
cf9d204e18 Merge pull request #3187 from FinnStutzenstein/Issue3186 
Fixes #3060, fixes #3186.
 2017-04-07 16:47:42 +02:00
Norman Jäckel
66ad801bad Merge pull request #3172 from FinnStutzenstein/logout 
Do not reload on logout (fixes #2868).
 2017-04-07 16:32:41 +02:00
FinnStutzenstein
c86f6d3684 Do not reload on logout (fixes #2868) 2017-04-07 16:22:32 +02:00
FinnStutzenstein
cefdabc3d7 fixes #3060, fixes #3186 2017-04-07 15:16:09 +02:00
Emanuel Schütze
598dc30486 Merge pull request #3185 from FinnStutzenstein/export-dialog 
Export dialog for motions
 2017-04-07 15:09:15 +02:00
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze
4ffbe77814 Merge pull request #3182 from emanuelschuetze/Release-2.1.1 
Release 2.1.1
 2017-04-05 21:48:20 +02:00
Emanuel Schütze
1d1bf7366f Update version to 2.1.2-dev 2017-04-05 20:31:42 +02:00
Emanuel Schütze
bbbad71e2d Release 2.1.1 2017-04-05 20:30:07 +02:00
Emanuel Schütze
db817fc1b2 Merge pull request #3177 from normanjaeckel/GeissRelease 
Added version to getgeiss command.
 2017-04-05 17:34:46 +02:00
Emanuel Schütze
a45807eddd Merge pull request #3176 from normanjaeckel/TopicTest 
Added some tests for topics. See #3175.
 2017-04-05 17:31:57 +02:00
Norman Jäckel
757bbc62e5 Added version to getgeiss command. 2017-04-03 13:41:48 +02:00
Norman Jäckel
eea623befa Added some tests for topics. See #3175. 2017-04-03 13:17:10 +02:00
Norman Jäckel
a350d15bd0 Merge pull request #3174 from FinnStutzenstein/Issue3173 
fixes #3173
 2017-04-03 09:53:09 +02:00
FinnStutzenstein
44ed866210 fixes #3173 2017-03-31 12:28:13 +02:00
Emanuel Schütze
d758159bff Merge pull request #3168 from normanjaeckel/Release-2.1 
Release 2.1
 2017-03-29 17:29:21 +02:00
Norman Jäckel
7f55bc9377 Update version to 2.1.1-dev 2017-03-29 14:34:17 +02:00
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