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

3337 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
3f7a4c68d3 Merge pull request #1977 from normanjaeckel/Gulp 
Gulp
 2016-02-16 17:37:43 +01:00
Norman Jäckel
c818a4964f Activate gulp jshint for Travis. 2016-02-16 01:01:26 +01:00
Norman Jäckel
75f4a2e62d Work on JavaScript coding style. 2016-02-16 00:56:56 +01:00
Norman Jäckel
40a3d4534e Merge pull request #1972 from emanuelschuetze/tinymce 
Use tinymce instead of CKEditor.
 2016-02-16 00:27:58 +01:00
Emanuel Schuetze
16f1ad5731 Use tinymce instead of CKEditor. 
- better integration of tinymce in bower and gulp
- Improve support for html tags in reportlab's motion pdf.
- Now paste from word works without problems
  (That was the main reason of switching to tinymce:
   The data loss problem with MS Word is still unfixed in CKEditor,
   see https://dev.ckeditor.com/ticket/13174)
- The editor is now used for customslides (text), motions (text,
  reason) and users (about).
- Use mediafile image list for tinymce.
- Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n
 2016-02-16 00:22:01 +01:00
Norman Jäckel
2d5f5c685c Merge pull request #1964 from emanuelschuetze/assignmentpoll 
Assignmentpoll slide
 2016-02-15 23:50:43 +01:00
Emanuel Schuetze
503325220f Show selected poll on assignment slide. 2016-02-15 23:47:31 +01:00
Norman Jäckel
8436963dce Merge pull request #1969 from emanuelschuetze/templateFixes 
Template fixes
 2016-02-14 23:01:04 +01:00
Emanuel Schuetze
aee8ed2f3b Template fixes 
- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
 2016-02-14 22:19:14 +01:00
Emanuel Schütze
81c6913ff3 Merge pull request #1971 from normanjaeckel/HideConfig 
Added possibility to hide config variables.
 2016-02-14 22:00:45 +01:00
Norman Jäckel
cc55aff8cc Added possibility to hide config variables. 2016-02-14 21:38:26 +01:00
Norman Jäckel
46c125d0c5 Merge pull request #1970 from ostcar/fix_1954 
Fix autoupdate of motion title
 2016-02-14 14:16:03 +01:00
Oskar Hahn
481822219a Fix autoupdate of motion title 
fix #1954
 2016-02-13 07:15:47 +01:00
Emanuel Schütze
ea4d3a2d75 Merge pull request #1968 from normanjaeckel/FixDefaultVotesError 
Fixed error in poll default_votes_validator. Fixed #1967.
 2016-02-11 20:47:35 +01:00
Norman Jäckel
198f09801c Fixed error in poll default_votes_validator. Fixed #1967. 2016-02-11 18:02:57 +01:00
Norman Jäckel
ad7653fb76 Merge pull request #1966 from emanuelschuetze/mediafile 
Use prune_elements for activate mediafile. (Fixed #1910)
 2016-02-09 23:22:42 +01:00
Emanuel Schuetze
322957eb7e Fixed motion edit url. 2016-02-09 23:05:36 +01:00
Emanuel Schuetze
b4cad89939 Use btn-group for projector controls. Added reset scaling. 2016-02-09 22:47:54 +01:00
Emanuel Schuetze
b1dc73ec4d Use prune_elements for activate mediafile. (Fixed #1910) 
Use page-fit to show pdf in full width.
Fix mediafile search result.
 2016-02-09 22:38:07 +01:00
Emanuel Schütze
9fda27dfd6 Merge pull request #1965 from normanjaeckel/BadVoteValues 
Fixed validation of default votes in assignment and motion poll. Fixe…
 2016-02-09 21:43:11 +01:00
Norman Jäckel
f627624271 Merge pull request #1963 from emanuelschuetze/updateDE 
Update German translations
 2016-02-09 21:18:13 +01:00
Norman Jäckel
60b6a7efe1 Fixed validation of default votes in assignment and motion poll. Fixed #1959. 2016-02-09 21:14:01 +01:00
Emanuel Schuetze
c383147f7b Updated German translations for django.po 2016-02-09 16:54:08 +01:00
Emanuel Schuetze
0dd3c3158f Updated angular-gettext en source file. 2016-02-09 16:49:55 +01:00
Emanuel Schuetze
eae50b46de Fixed closing tag for correct translation string 2016-02-09 16:49:32 +01:00
Norman Jäckel
0fe2b9cd8a Merge pull request #1962 from emanuelschuetze/templateFixes3 
Motion state translation strings are still used by motion pdf.
 2016-02-09 09:32:21 +01:00
Emanuel Schütze
657d45f268 Merge pull request #1960 from normanjaeckel/Gulp 
Fixed gulp-cssnano.
 2016-02-09 00:18:50 +01:00
Emanuel Schuetze
7248673b47 Motion state translation strings are still used by motion pdf. 
Reverted partly the changes in motion/signmals.py by a8544f016d.
 2016-02-09 00:11:48 +01:00
Norman Jäckel
6ccf1f0673 Merge pull request #1961 from emanuelschuetze/templateFixes2 
Refactored MotionPoll.
 2016-02-09 00:05:08 +01:00
Emanuel Schuetze
31102bd9d7 Refactored MotionPoll. 
Use new getVotes function for vote value and percent value.
Remove 'to_representation' function in motion serializer.py to get
special values in numbers (-1,-2) instead of translated strings.
 2016-02-08 23:56:44 +01:00
Norman Jäckel
801618d815 Fixed gulp-cssnano. 2016-02-08 23:51:57 +01:00
Emanuel Schütze
e6b1695c88 Merge pull request #1958 from normanjaeckel/Gulp 
Updated gulp-uglify.
 2016-02-08 23:31:59 +01:00
Norman Jäckel
086eb2937a Updated gulp-uglify. 2016-02-08 23:02:09 +01:00
Norman Jäckel
25a7f59b70 Merge pull request #1950 from normanjaeckel/Worker.js 
Simplified installing of JS and CSS libs. Fixed #1906.
 2016-02-08 22:35:28 +01:00
Norman Jäckel
3be21473a4 Merge pull request #1956 from emanuelschuetze/master 
Several template fixes
 2016-02-08 22:32:56 +01:00
Emanuel Schütze
6cd3e48e45 Merge pull request #1952 from normanjaeckel/ErrorMessages 
Used 'detail' for all ValidationError messages. See #1946.
 2016-02-08 22:22:43 +01:00
Emanuel Schuetze
96b4784d52 Show motion poll results on projector. 2016-02-08 22:15:31 +01:00
Norman Jäckel
87a97edd69 Used 'detail' for all ValidationError messages. See #1946. 2016-02-08 21:52:23 +01:00
Emanuel Schuetze
0a4cdb3717 Used copy of motionpoll for MotionPollUpdate dialog. 2016-02-08 21:41:01 +01:00
Emanuel Schuetze
82f2c4f003 Fixed quickEdit mode in agenda, motion, assignment. 
Refresh motion object after cancel.
 2016-02-08 21:37:20 +01:00
Emanuel Schuetze
6ba47a64d3 Agenda list view: allow to delete also motion and assignment items. 
Fixes #1943
 2016-02-08 21:07:35 +01:00
Emanuel Schuetze
f89f3a9933 Improved motion state dropdown element. 2016-02-08 20:34:12 +01:00
Emanuel Schuetze
4bbb153c42 Use Roboto font in projector header/footer. 2016-02-08 20:27:59 +01:00
Emanuel Schuetze
963bebac29 CKEditor v4.5.7 does not work (Syntax Error). 
Go back to last working version 4.5.6.
 2016-02-07 19:49:15 +01:00
Emanuel Schütze
c40dfb120b Merge pull request #1951 from normanjaeckel/Autoupdate 
Fixed problem with some REST requests during autoupdate. Fixed #1935.
 2016-02-07 14:17:33 +01:00
Norman Jäckel
0e784cde31 Fixed problem with some REST requests during autoupdate. Fixed #1935. 2016-02-05 23:55:06 +01:00
Norman Jäckel
8cb74c5e7a Simplified installing of JS and CSS libs. Fixed #1906. 2016-02-05 23:27:15 +01:00
Emanuel Schütze
378218e8a5 Merge pull request #1944 from normanjaeckel/README 
Updated README.
 2016-02-05 22:48:22 +01:00
Emanuel Schütze
fc35468faf Merge pull request #1947 from normanjaeckel/AssignmentPDF 
Fixed assignment PDF. Fixed #1940.
 2016-02-05 22:30:23 +01:00
Norman Jäckel
2ba675c1b6 Fixed assignment PDF. Fixed #1940. 2016-02-05 21:22:47 +01:00