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

3368 Commits

Author SHA1 Message Date
FinnStutzenstein
349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
Emanuel Schütze
7c8bc935f8 Show pdf footer logo. Fixed layout. 2017-04-27 12:58:11 +02:00
FinnStutzenstein
fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +02:00
Sean Engelhardt
2b94dc5942 Added configurable header and footer logos for PDF. 2017-04-27 12:58:11 +02:00
Oskar Hahn
74c1cc63dc Open websocket connections immediately 
Also made a performance boost to get_model_from_collection_string()
 2017-04-27 12:54:16 +02:00
Norman Jäckel
bd68997a5d Added notify system. 2017-04-27 09:30:02 +02:00
FinnStutzenstein
96899f63cc Personal note (client side) 2017-04-27 09:10:46 +02:00
Norman Jäckel
6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Emanuel Schütze
4cd9d20435 Improved motion catalog pdf for one/mutliple motions. 2017-04-24 14:53:42 +02:00
Emanuel Schütze
9ebf3509c0 Updated translation files and German translation. 2017-04-24 10:44:32 +02:00
Emanuel Schütze
b06f10dea8 Merge pull request #3210 from FinnStutzenstein/SpeakerSort 
Fixing issue when sorting a new inserted speaker
 2017-04-24 09:54:51 +02:00
FinnStutzenstein
7d1b65429e Fixing issue when sorting a new inserted speaker. 2017-04-24 09:45:53 +02:00
Sean Engelhardt
3cb07c97dc Added more distance in motion PDF for DEL-tags in new lines (fixes #3205). 2017-04-24 09:43:18 +02:00
Norman Jäckel
24e7d42f6f Merge pull request #3207 from FinnStutzenstein/LogoHeader 
Configurable projector header
 2017-04-21 22:09:18 +02:00
Emanuel Schütze
8c4ec1c218 Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching 
Bugfix: changing line length did not invalidate cache
 2017-04-19 15:03:48 +02:00
FinnStutzenstein
61058fac49 Configurable projector header image 2017-04-19 14:54:31 +02:00
Tobias Hößl
9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel
8380e97f93 Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks 
Add a parameter 'lineBreaks' to getTextByMode
 2017-04-19 14:45:24 +02:00
Emanuel Schütze
3614ba9451 Fixed compare of duplicated users while csv user import. 2017-04-19 13:38:06 +02:00
FinnStutzenstein
d78a7f91bc Fix clearing empty chat messages (fixes #3192) 2017-04-19 08:00:18 +02:00
Tobias Hößl
a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +02:00
Norman Jäckel
21418f632f Added support for password validation using Django or custom validators e. g. for minimum password length. 2017-04-13 16:20:38 +02:00
Emanuel Schütze
7d2785b9ec Merge pull request #3189 from FinnStutzenstein/pdf-zip 
Pdf zip
 2017-04-13 11:54:19 +02:00
Emanuel Schütze
768cc5f711 Merge pull request #3196 from emanuelschuetze/motionCommentRegression 
Fixed regression that opening of motion create form failed.
 2017-04-12 20:12:57 +02:00
Emanuel Schütze
cbccd17752 Fixed translation strings and updated German translations. 2017-04-12 20:03:07 +02:00
FinnStutzenstein
845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze
d1ff1e540f Fixed regression that opening of motion create form failed. 
Introduced with commit 3de4a2af1c.
 2017-04-12 15:17:47 +02:00
Emanuel Schütze
6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert 
Add local convert to Base64 (Fixes #2705)
 2017-04-12 15:09:43 +02:00
Sean Engelhardt
65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
Emanuel Schütze
2be9d45884 Merge pull request #3184 from FinnStutzenstein/Logo 
Support logos
 2017-04-12 14:49:59 +02:00
FinnStutzenstein
6c932aa77a Support logos 2017-04-12 14:28:46 +02:00
Emanuel Schütze
b9bab6fc17 Merge pull request #3191 from normanjaeckel/FreeUser 
User without permission to see users can now see some of them.
 2017-04-12 10:20:48 +02:00
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
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
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
FinnStutzenstein
c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +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
Norman Jäckel
757bbc62e5 Added version to getgeiss command. 2017-04-03 13:41:48 +02:00
FinnStutzenstein
44ed866210 fixes #3173 2017-03-31 12:28:13 +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
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
FinnStutzenstein
d9e3da87f5 fixing validate_html and motion saving (fixes #3140) 
using PATCH
 2017-03-28 19:39:06 +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
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
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
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
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
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
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
sean
8324dbba16 adjust indentation for new insertions in PDF 2017-03-22 21:57:56 +01:00
Tobias Hößl
45cac43193 Remove erroneous margin around inline diff paragraphs in PDF 2017-03-22 20:54:56 +01:00
Emanuel Schütze
e5028f7ef2 Merge pull request #3127 from emanuelschuetze/issue3112 
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, #3038)
 2017-03-22 15:54:38 +01:00
Emanuel Schütze
2571d83195 Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, fixed #3038). 
- Provided csv header fields as meta data while csv import (#3038).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
 2017-03-22 15:37:08 +01:00
Emanuel Schütze
0c3ecb0acb Merge pull request #3129 from tsiegleauq/issue2811-more-parsing-issues 
fix pdf style parsing issue (fixes #2811)
 2017-03-22 15:28:05 +01:00
sean
bb5394eb36 fix pdf style parsing issue (fixes #2811) 2017-03-22 14:57:08 +01:00
Norman Jäckel
4f3fdf1699 Merge pull request #3125 from CatoTH/pass-line-numbers-through-diff 
Beginning: passing line numbers through the diff
 2017-03-22 14:24:23 +01:00
Emanuel Schütze
b6e1b3fc67 Updated translations (Fixed #2955) 2017-03-22 12:52:11 +01:00
Tobias Hößl
c912811bd3 Beginning: passing line numbers through the diff 2017-03-22 12:21:45 +01:00
Norman Jäckel
6b253ef4b7 Merge pull request #3124 from emanuelschuetze/tooltip 
Fixed hidden tooltip content in motion toolbar.
 2017-03-22 10:57:51 +01:00
Emanuel Schütze
af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +01:00
Emanuel Schütze
19d16a1ea7 Show username if first and last name is empty (Fixed #3121) 2017-03-22 09:13:33 +01:00
Emanuel Schütze
869105dc40 Minor fixes 
- Added motion change recommendations to full text search.
- Show csv/docx export entries in list views for manager only.
 2017-03-22 08:47:32 +01:00
Norman Jäckel
861df5f5c1 Merge pull request #3120 from emanuelschuetze/diff-box 
Hide change recommendation diff-box in diff version for normal users.
 2017-03-21 23:05:02 +01:00
Norman Jäckel
e57afb9ab4 Merge pull request #3118 from emanuelschuetze/issue3081 
Allow style attributes for about field in user detail template (Fixed #3081)
 2017-03-21 23:03:27 +01:00
Emanuel Schütze
70de0a6e4b Hide change recommendation diff-box in diff version for normal users. 2017-03-21 20:47:58 +01:00
Norman Jäckel
b7d3acc94b Merge pull request #3114 from emanuelschuetze/assignment-fixes 
Fixed assignment JS bugs (Fixed #3099)
 2017-03-21 17:28:03 +01:00
Norman Jäckel
c39d003f01 Merge pull request #3113 from FinnStutzenstein/assignment-tabs 
Fixes Ballot tabs on create/delete (fixes #3058)
 2017-03-21 17:22:15 +01:00