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

4122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
e57a83f45b Merge pull request #1997 from emanuelschuetze/fix1817 
Get success message in user edit form when default password is resetted
 2016-02-24 00:45:05 +01:00
Emanuel Schütze
0cbb3fba01 Merge pull request #1996 from normanjaeckel/LanguageHeader 
Added language header to internal server requests. Fixed #1981.
 2016-02-23 23:54:44 +01:00
Emanuel Schuetze
bed96f66b0 Get success message in user edit form when default password is resetted (Fixes #1817). 2016-02-23 23:51:42 +01:00
Norman Jäckel
73cc1a5dfb Merge pull request #1995 from emanuelschuetze/fix1991 
Add/Remove a group to selected users (Fixes #1991)
 2016-02-23 23:37:57 +01:00
Norman Jäckel
3ea4c507cf Added language header to internal server requests. Fixed #1981. 2016-02-23 23:19:38 +01:00
Emanuel Schuetze
e284b79c8e Add/Remove a group to selected users (Fixes #1991) 2016-02-23 23:16:13 +01:00
Emanuel Schütze
ca5f707f74 Merge pull request #1994 from normanjaeckel/FileNotFound 
Fixed error if a PDF file was deleted from the server. Fixed #1988.
 2016-02-23 22:44:35 +01:00
Norman Jäckel
9a94dfc735 Merge pull request #1993 from emanuelschuetze/fix1710 
Added motion poll pdf (Fixes #1710).
 2016-02-23 22:38:28 +01:00
Norman Jäckel
eecfc45dce Merge pull request #1992 from emanuelschuetze/fixes1 
Several template fixes
 2016-02-23 22:36:50 +01:00
Norman Jäckel
e8402f6ffa Fixed error if a PDF file was deleted from the server. Fixed #1988. 2016-02-23 22:35:04 +01:00
Emanuel Schuetze
eebb621a98 Added motion poll pdf (Fixes #1710). 2016-02-23 22:27:03 +01:00
Emanuel Schuetze
16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
70dc8443fd Revert one change from #1984 in CHANGLOG. (Fixes #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
0613304724 Use colorpicker for projector header color config. 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
ba49781b39 Show orange countdown in last x seconds of speaking time (add new config) 2016-02-23 22:24:38 +01:00
Emanuel Schuetze
647e62fb0d Set focus for chat input 2016-02-23 22:24:33 +01:00
Emanuel Schuetze
150744e607 Fixed showing users filters. 2016-02-20 11:35:51 +01:00
Emanuel Schuetze
b0b858a808 Mediafile PDF controls: set 'page-fit' (100%) by default, disabled previous/next buttons 2016-02-20 11:29:38 +01:00
Emanuel Schütze
4016c1ea4b Merge pull request #1985 from emanuelschuetze/release2.0b4 
Release 2.0b4
 2016-02-17 21:27:18 +01:00
Emanuel Schuetze
de276d951c Update version to 2.0b5-dev 2016-02-17 21:24:14 +01:00
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