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

2526 Commits

Author SHA1 Message Date
Emanuel Schütze
54ee068057 Merge pull request #2243 from FinnStutzenstein/master 
Fixing issue #2127
 2016-08-05 16:13:19 +02:00
Finn Stutzenstein
b115691675 Messages now allow HTML tags (Fixes #2127) 2016-08-05 12:38:19 +02:00
Maximilian Krambach
350a60722c repairs ballots for candidates with structure_level 2016-08-05 09:53:10 +02:00
Norman Jäckel
81bcb19847 Merge pull request #2221 from matakuka/issue2214 
Added user field "number" (fixes #2214)
 2016-08-04 10:21:17 +02:00
Emanuel Schütze
6cec9e9f87 Merge pull request #2251 from normanjaeckel/WooshAsync 
Used whoosh.writing.AsyncWriter. See #2198.
 2016-08-03 21:42:58 +02:00
Maximilian Krambach
371945e36e adding user field "number" (fixes #2214) 2016-08-03 16:55:03 +02:00
Norman Jäckel
7f1b894db4 Used whoosh.writing.AsyncWriter. See #2198. 2016-08-03 16:46:52 +02:00
Norman Jäckel
f191956dd9 Fixed error in autoupdate. See #2248. 2016-08-03 16:12:52 +02:00
Norman Jäckel
e688a345c0 Merge pull request #2230 from emanuelschuetze/remove-assignment-config 
Remove unused assignment config to publish winner results only.
 2016-08-03 15:58:35 +02:00
joelmacht
19592f1eea Add tags for assingments 2016-08-03 14:48:12 +02:00
Maximilian Krambach
f2f7ddf072 translations issue #2197 2016-08-01 16:23:20 +02:00
Norman Jäckel
d3cd2d72dc Merge pull request #2225 from normanjaeckel/NumberCategories 
Added viewpoint to number all motions in a category.
 2016-07-29 12:30:09 +02:00
Emanuel Schuetze
8d52d4a1c6 Remove unused assignment config to publish winner results only. (Fixes #2145) 2016-07-29 12:29:53 +02:00
Norman Jäckel
646540ee17 Merge pull request #2233 from emanuelschuetze/motionOrigin 
Use origin field in motion detail and list view (Fixes #2227)
 2016-07-29 12:16:19 +02:00
Norman Jäckel
7e6dc50b39 Added viewpoint to number all motions in a category. 2016-07-29 11:56:12 +02:00
Emanuel Schuetze
88715646ba Show user fields is_committee and is_active in list view. (Fixes #2217) 
New icon for is_committee and is_active.
Check is_committee field for csv import.
 2016-07-29 11:37:51 +02:00
Norman Jäckel
4b9767b09e Added new user field is_committee and new default group Committees. 2016-07-29 11:37:51 +02:00
Emanuel Schütze
aca01c466c Merge pull request #2222 from matakuka/issue2210 
add "delete all speakers" button (feature, issue #2210)
 2016-07-28 11:11:31 +02:00
Maximilian Krambach
589137ece7 add "delete all speakers" button (fixes #2210) 2016-07-28 10:51:33 +02:00
Emanuel Schuetze
af16733b36 Use origin field in motion detail and list view (Fixes #2227) 2016-07-27 16:16:22 +02:00
Emanuel Schütze
45321b6139 Merge pull request #2226 from normanjaeckel/MotionOrigin 
Added motion origin field.
 2016-07-27 16:14:31 +02:00
Emanuel Schuetze
8208f44108 Updated German translations. 2016-07-27 14:10:04 +02:00
Norman Jäckel
0b9a64f968 Added motion origin field. 2016-07-13 14:45:40 +02:00
Norman Jäckel
2627724c55 Merge pull request #2199 from matakuka/noBrowserLanguage 
sets language to en if no browser language is set
 2016-07-11 14:19:14 +02:00
Norman Jäckel
207db4de89 Merge pull request #2186 from tsiegleauq/issue2164 
Add translatable entries for QuickEdit (Fixes #2164)
 2016-07-10 23:24:36 +02:00
Maximilian Krambach
31df629fc9 sets language to en if no browser language is set 2016-07-06 09:52:32 +02:00
Sean Engelhardt
520f8362fa Add translatable entries for QuickEdit (Fixes #2164) 2016-06-28 14:06:46 +02:00
Emanuel Schuetze
31657d0cf3 Fixed and update English translation strings. 2016-06-28 10:18:43 +02:00
Emanuel Schuetze
31c509f288 Updated EN source translation files. 2016-06-20 21:03:43 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Emanuel Schütze
7a94b6511b Merge pull request #2189 from matakuka/YesNoVotes 
adding option "yes/no for each candidate"
 2016-06-12 11:11:10 +02:00
Joel Macht
b7d83e786f Fix linebreak on tags, add spacing and remove commas (Fixes #2147) 2016-06-10 18:17:42 +02:00
Maximilian Krambach
3157ac59f2 adding option "yes/no for each candidate" 2016-06-10 14:13:01 +02:00
Oskar Hahn
fe64941aab Big Mode for OpenSlides 
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
 2016-06-09 11:14:39 +02:00
Maximilian Krambach
5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Maximilian Krambach
649300cfb8 Add a back button to tag overview (Fixed #2151) 2016-06-08 16:41:27 +02:00
Norman Jäckel
a8595ab234 Merge pull request #2185 from tsiegleauq/issue2156 
Fix pagination when agenda got >100 entrys (Fixes #2156)
 2016-06-08 10:45:07 +02:00
Norman Jäckel
13e7e1b1e1 Merge pull request #2176 from tsiegleauq/issue2133 
Limit selection of files to csv and txt (Fixed #2133)
 2016-06-08 10:41:52 +02:00
Sean Engelhardt
235eed1172 Fix pagination when agenda got >100 entrys (Fixes #2156) 2016-06-07 14:17:36 +02:00
Sean Engelhardt
62310c83ae Limit selection of files to csv and txt (Fixed #2133) 
agenda, motions, users csv import
 2016-06-07 11:34:02 +02:00
Norman Jäckel
294fb7ebc5 Fixed motion PDF if motions have no identifier. Fixed #2158. 2016-06-06 14:26:16 +02:00
Norman Jäckel
8c5c5dc556 Fixed bug on config view. 2016-06-06 14:19:57 +02:00
Oskar Hahn
f2570551a1 Merge pull request #2175 from ostcar/config 
Redesign of the config variables.
 2016-06-04 01:12:50 +02:00
Oskar Hahn
2221b23447 Redesign of the config variables. 
Removed the config cache and created files for each app in which the
config variables are defined.
 2016-06-03 13:47:54 +02:00
Sean Engelhardt
d0c9450d02 Updated German translations (Fixes #2132) 2016-05-31 15:00:38 +02:00
Oskar Hahn
416c2646fe Order speaker on projector 
fixes #2138
 2016-05-28 19:22:49 +02:00
Emanuel Schütze
61976f47f0 Merge pull request #2144 from normanjaeckel/SettingsFix 
Fixed example text in settings.
 2016-05-28 15:42:17 +02:00
Emanuel Schuetze
80b6dcc971 Updated Spanish translation. 
Thanks to johnfelipe!

Fixed: Define missing Spanish translation in django settings file.
 2016-05-25 09:58:55 +02:00
Norman Jäckel
253d615755 Fixed example text in settings. 2016-05-17 14:16:44 +02:00
Erik Steenman
4b7ba02b7d Change the z-index of .fullscreen to 100. 
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
 2016-05-10 14:51:30 +02:00
Norman Jäckel
e968c88cc1 Update version to 2.0.1-dev 2016-04-17 22:49:17 +02:00
Norman Jäckel
347cf478f8 Release 2.0 2016-04-17 22:49:17 +02:00
Emanuel Schuetze
e0b73ff68a Use group_id instead of group in User form views 2016-04-17 22:42:56 +02:00
Emanuel Schuetze
e151e7c84c Fix z-index of chatbox and projector sidebar. 2016-04-17 22:18:16 +02:00
Emanuel Schuetze
06d333c067 Template fixes for better smartphone usage. 
- Remove on-focus-me directive on every list view.
  (Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
  on small devices.
- Add z-index for projector sidebar. Show it in full width on small
  devices.
- Remove padding on small devices.
 2016-04-17 19:56:38 +02:00
Emanuel Schuetze
7ebedb1fdd Use always user.groups_id (Fixes #2081) 
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
 2016-04-14 22:13:28 +02:00
Emanuel Schuetze
9481d037e8 Reduce sizes of used logos. 2016-04-13 11:06:50 +02:00
Norman Jäckel
8d5e983d29 Merge pull request #2077 from emanuelschuetze/translations 
Translations
 2016-04-12 23:47:38 +02:00
Emanuel Schuetze
b8194a0b54 Updated all translations (angular-gettext). 2016-04-12 22:58:40 +02:00
Emanuel Schuetze
7229c8dc3a Fix translation strings. 2016-04-12 22:47:46 +02:00
Emanuel Schuetze
7e5ea61b34 Hide candidate list if assignment phase is finished (2). 2016-04-12 22:41:15 +02:00
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
Norman Jäckel
27c8d511f0 Used exit method from sys library. Fixed #2065. 2016-04-07 00:43:53 +02:00
Emanuel Schuetze
cb605d619e Mark missing translation string. 2016-04-03 11:53:40 +02: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
d51652ff72 Merge pull request #2061 from emanuelschuetze/template-Fixes 
Template fixes
 2016-03-21 20:03:43 +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
Emanuel Schuetze
815f03145c Use specific host and port for 'openslides start'. (Fixes #1987) 2016-03-21 00:06:15 +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
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 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
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
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
Norman Jäckel
15119ab28b Merge pull request #2041 from emanuelschuetze/fix2020 
New configs for font color in header and h1 on projector (Fixes #2020)
 2016-03-08 23:16:28 +01:00
Emanuel Schuetze
b9fed84732 Updated EN language files. 2016-03-08 23:01:20 +01:00
Emanuel Schuetze
85326d75f2 New configs for font color in header and h1 on projector (Fixes #2020) 2016-03-08 23:01:17 +01:00
Emanuel Schuetze
f47055c13a Fix 'stop' speech button in Safari (Fixes #2029) 
Use '{}' instead of empty 'JSON.stringify()'.
 2016-03-08 20:23:12 +01:00
Norman Jäckel
56936c86ab Used bulk_create to create the initial projector during migration. Fixed #2035. 2016-03-07 19:09:45 +01:00
Norman Jäckel
ce3576f306 Merge pull request #2034 from emanuelschuetze/fix2005 
Fix main menu on small devices (Fixes #2005)
 2016-03-07 19:00:08 +01:00
Emanuel Schütze
2097121e45 Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset 
Fixed get_queryset method of ItemViewSet. Fixed #2027.
 2016-03-06 22:48:50 +01:00
Emanuel Schuetze
876d9408fe Fix main menu on small devices (Fixes #2005) 
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
 2016-03-06 20:14:52 +01:00
Norman Jäckel
78565ffd25 Updated migrations. 2016-03-06 14:36:50 +01:00