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

3352 Commits

Author SHA1 Message Date
Emanuel Schuetze 51358aba51 Release 2.0b4 2016-02-17 21:24:14 +01:00
Emanuel Schütze 41d9706a35 Merge pull request #1986 from emanuelschuetze/fixCSVimport 
Fix motions and users csv import.
 2016-02-17 21:23:28 +01:00
Emanuel Schuetze 0e40735931 Fix motions and users csv import. 2016-02-17 21:19:26 +01:00
Emanuel Schütze 7391771316 Merge pull request #1984 from emanuelschuetze/changelog 
Updated CHANGELOG
 2016-02-17 20:42:28 +01:00
Emanuel Schütze ecb29a1403 Merge pull request #1980 from normanjaeckel/PluginAPI 
Updated API for plugins.
 2016-02-17 20:40:40 +01:00
Emanuel Schütze fde94c6af1 Merge pull request #1983 from emanuelschuetze/updateTranslations 
Updated all lanuages (JS only)
 2016-02-17 20:39:37 +01:00
Emanuel Schuetze dcb12e60c7 Updated CHANGELOG 2016-02-17 20:38:29 +01:00
Emanuel Schuetze 8c4d1e24df Updated all lanuages (JS only) 2016-02-17 20:18:45 +01:00
Emanuel Schütze 2dd0013047 Merge pull request #1982 from emanuelschuetze/fixes 
Several important fixes for beta4
 2016-02-17 19:52:59 +01:00
Emanuel Schuetze 2473a6ef69 Updated angular-gettext EN source. 2016-02-17 17:58:04 +01:00
Emanuel Schuetze 84ea0bf1f5 Several important fixes for beta4 
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
 2016-02-17 17:49:44 +01:00
Norman Jäckel dcc325c716 Fixed test plugin. 2016-02-16 23:04:26 +01:00
Norman Jäckel d181eedeb9 Updated API for plugins. 2016-02-16 22:33:41 +01:00
Emanuel Schütze 956bba9a13 Merge pull request #1978 from normanjaeckel/ChangeProfileFix 
Fixed groups attribute of user in the client. Fixed #1974.
 2016-02-16 21:02:53 +01:00
Norman Jäckel 3f7a4c68d3 Merge pull request #1977 from normanjaeckel/Gulp 
Gulp
 2016-02-16 17:37:43 +01:00
Norman Jäckel df06abe70e Fixed groups attribute of user in the client. Fixed #1974. 2016-02-16 14:18:20 +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