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

4223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schuetze
f5125d0d23 Add content object (motion/election) in agenda sort view. 2016-04-12 22:33:53 +02:00
Emanuel Schuetze
07d95fd10a Allow to show vote value '0' in motion poll result view. 2016-04-12 22:26:13 +02:00
Emanuel Schuetze
cbfcc6df68 Use angular 1.4.10 2016-04-12 21:57:22 +02:00
Norman Jäckel
8a03c15c35 Merge pull request #2072 from emanuelschuetze/fix2064 
Order of jquery and angular in bower.json is important (Fixes #2064).
 2016-04-11 17:29:29 +02:00
Emanuel Schuetze
642650781c Order of jquery and angular in bower.json is important (Fixes #2064). 
jquery has to load *before* angular! Otherwise ng-model and ng-change doesn't
work with angular-chosen select elements.
 2016-04-11 11:19:59 +02:00
Emanuel Schütze
00fe5a165f Merge pull request #2070 from normanjaeckel/SysExit 
Used exit method from sys library. Fixed #2065.
 2016-04-07 19:51:27 +02:00
Norman Jäckel
27c8d511f0 Used exit method from sys library. Fixed #2065. 2016-04-07 00:43:53 +02:00
Norman Jäckel
b116aabac3 Merge pull request #2068 from emanuelschuetze/gulpfile 
Fixes for 2.0
 2016-04-07 00:38:00 +02:00
Emanuel Schuetze
3c59f1f75c Set angular-ui-tinymce to v0.0.14 (Fixes #2069). 2016-04-06 22:02:09 +02:00
Emanuel Schuetze
c2230c0251 Added missing en.js for tinyMCE. (Fixes #2067) 2016-04-05 20:04:36 +02:00
Emanuel Schuetze
cb605d619e Mark missing translation string. 2016-04-03 11:53:40 +02:00
Emanuel Schütze
11ea2fdecf Merge pull request #2063 from normanjaeckel/Release_2.0b5 
Release 2.0b5
 2016-03-21 21:21:16 +01:00
Norman Jäckel
331da7f300 Update version to 2.0-dev. 2016-03-21 21:13:52 +01:00
Norman Jäckel
5842ad86f4 Release 2.0b5 2016-03-21 21:13:28 +01:00
Norman Jäckel
b0c1d3f793 Merge pull request #2062 from normanjaeckel/Readme 
Updated README and bower
 2016-03-21 21:11:55 +01:00
Norman Jäckel
afeb746718 Updated README and bower 2016-03-21 21:07:18 +01:00
Norman Jäckel
d51652ff72 Merge pull request #2061 from emanuelschuetze/template-Fixes 
Template fixes
 2016-03-21 20:03:43 +01:00
Norman Jäckel
36ead3685f Merge pull request #2060 from emanuelschuetze/allTranslations 
Updated all translations. (Fixes #2043)
 2016-03-21 20:03:25 +01:00
Emanuel Schütze
bdf4741dd8 Merge pull request #2059 from normanjaeckel/Changelog 
Updated CHANGELOG.
 2016-03-21 20:01:49 +01:00
Emanuel Schuetze
4b06fa225f Updated all translations. (Fixes #2043) 
Thanks to all translators of FR, PT, CS, ES and DE!
 2016-03-21 19:57:45 +01:00
Emanuel Schuetze
0565d57789 Template fixes 
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
 2016-03-21 19:56:53 +01:00
Norman Jäckel
4f0d5fd0ea Updated bower and setup file. 2016-03-21 19:52:06 +01:00
Norman Jäckel
cb66facde5 Updated CHANGELOG. 2016-03-21 19:37:42 +01:00
Norman Jäckel
aa122263e1 Merge pull request #2057 from emanuelschuetze/fix1987 
Use specific host and port for 'openslides start' (Fixes #1987)
 2016-03-21 00:22:06 +01:00
Emanuel Schuetze
815f03145c Use specific host and port for 'openslides start'. (Fixes #1987) 2016-03-21 00:06:15 +01:00
Emanuel Schütze
681882fb2d Merge pull request #2058 from emanuelschuetze/translationsEN 
Updated EN translation resource files.
 2016-03-20 23:36:01 +01:00
Emanuel Schuetze
fb0fd3fe8c Updated EN translation resource files. 2016-03-20 23:31:13 +01:00
Norman Jäckel
6d62516499 Merge pull request #2056 from ostcar/master 
Fix #2050
 2016-03-20 21:22:11 +01:00
Norman Jäckel
e2383dc770 Merge pull request #2051 from emanuelschuetze/templateFixes2 
Template improvements
 2016-03-20 21:21:52 +01:00
Oskar Hahn
46ba039cd5 Fix #2050 2016-03-20 21:08:57 +01:00
Emanuel Schuetze
3479a0636e Allow to enter countdown time in seconds or 'mm:ss' format. 2016-03-20 21:07:20 +01:00
Emanuel Schuetze
2af38f75bb Fix edit current slide button. 2016-03-20 21:07:16 +01:00
Norman Jäckel
7cba7c42a4 Merge pull request #2055 from emanuelschuetze/fix2048 
Catch JS error "this.getVersion(...) is undefined" (Fixes #2048)
 2016-03-20 21:06:39 +01:00
Emanuel Schuetze
85ffe4d8fa Catch JS error "this.getVersion(...) is undefined" (Fixes #2048) 2016-03-20 20:52:34 +01:00
Norman Jäckel
5af25351fa Merge pull request #2049 from emanuelschuetze/fix2028 
Catch 404 errors in resolve promise if user has not all required permissions
 2016-03-20 20:48:58 +01:00
Emanuel Schuetze
5e08e073f4 Fix translation strings in motions and users forms. 2016-03-19 13:06:36 +01:00
Emanuel Schuetze
0cd6bb272c Projector template improvements 
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
 2016-03-19 07:30:18 +01:00
Emanuel Schuetze
03f08628c7 Catch 404 errors in resolve promise if user has not all required permissions. 
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string

Fixes #2028. Fixes #2038.
 2016-03-18 21:41:16 +01:00
Norman Jäckel
bf8e4fa585 Merge pull request #2046 from emanuelschuetze/translations 
Update translation strings
 2016-03-18 21:08:16 +01:00
Emanuel Schuetze
9ab182184f Updated EN translation JS resource. 2016-03-18 20:11:56 +01:00
Emanuel Schuetze
140869ebd7 Fix translation strings. 2016-03-18 20:11:04 +01:00
Emanuel Schütze
4fc95e5f19 Merge pull request #2045 from emanuelschuetze/fix2006 
Use angular-chosen instead of ui-select for better performance.
 2016-03-18 14:41:19 +01:00
Emanuel Schuetze
89446ce4f6 Use angular-chosen instead of ui-select for better performance. 
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/

Use input delay on users filter field with 'debounce'.

Fixed #2006.
 2016-03-18 14:37:03 +01:00
Norman Jäckel
e7cb77c946 Merge pull request #2044 from emanuelschuetze/fixTranslation 
Fix translation
 2016-03-17 20:40:32 +01:00
Norman Jäckel
5c46a896d3 Merge pull request #2037 from emanuelschuetze/fix1975 
Use specific tag of tinymce-18n repo (Fixes #1975).
 2016-03-17 20:38:27 +01:00
Emanuel Schuetze
794fa9faf1 Updated EN translation JS resource file. 2016-03-17 12:48:06 +01:00
Emanuel Schuetze
ace335f7cc Fix missing translation string. 2016-03-17 12:47:44 +01:00
Norman Jäckel
b3582f462e Merge pull request #2042 from emanuelschuetze/spinner 
Template improvements
 2016-03-15 21:02:04 +01:00
Emanuel Schuetze
a8d9581664 Allow html in event name and description. 2016-03-14 17:09:37 +01:00
Emanuel Schuetze
1b25d9c376 Added loading spinner icon. 
Only for loading resolve object from server.
 2016-03-14 17:09:37 +01:00