Commit Graph

2641 Commits

Author SHA1 Message Date
Norman Jäckel
0fddfdd25a Merge pull request #2356 from emanuelschuetze/fix
Fixed missing translation and form errors.
2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Tobias Hößl
a341071e91 Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line 2016-09-05 20:31:43 +02:00
Tobias Hößl
b701127f04 Fix a styling problem 2016-09-05 20:03:41 +02:00
Norman Jäckel
b4d4026316 Refactored user serializers for different client permissions. See #1871. 2016-09-05 13:48:06 +02:00
Norman Jäckel
29f9203377 Merge pull request #2314 from FinnStutzenstein/Issue2137
new change password view (fixes #2137)
2016-09-05 13:46:15 +02:00
Maximilian Krambach
8ec5cd3ccd new fullscreen icon (fixes #2316) 2016-09-05 09:25:39 +02:00
Finn Stutzenstein
9d3b06c0a6 new change password view (fixes #2137) 2016-09-05 07:56:28 +02:00
Emanuel Schuetze
7abdc2e615 Increase the allowed characters for event name config to 100.
Same limit as event_description.
2016-09-01 15:32:59 +02:00
Norman Jäckel
c87111e81d Merge pull request #2318 from FinnStutzenstein/projectorSize
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein
a8dcc2abdc Control the resolution of the projector 2016-08-31 14:18:29 +02:00
Norman Jäckel
31e47e0ac5 Merge pull request #2308 from FinnStutzenstein/Issue1213
Handle duplicates during user import (fixes #1213)
2016-08-31 13:05:03 +02:00
Norman Jäckel
08c6fa11b4 Merge pull request #2291 from normanjaeckel/MotionAmendment
Reimplemented amendments for motions.
2016-08-31 12:39:48 +02:00
Finn Stutzenstein
78ec30d6b2 Handle duplicates during user import 2016-08-31 12:23:38 +02:00
Emanuel Schuetze
e87eb930df Use neutral (untranslated) prefix for amendments.
Reason: Server cannot use the on client-side translated prefix string.
2016-08-31 12:05:33 +02:00
Emanuel Schuetze
24b95e5fbc Scale image size also in detail and projector view. 2016-08-31 09:58:26 +02:00
sean
33f463599a limit image scale in pdf documents (fixes #2301) 2016-08-30 12:54:55 +02:00
Norman Jäckel
09aa2dea72 Review. 2016-08-29 17:15:44 +02:00
Norman Jäckel
6fba75c78b Reimplemented amendments for motions. 2016-08-29 17:14:40 +02:00
Norman Jäckel
ac6d78b0ee Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fixed #2275. 2016-08-29 17:06:33 +02:00
Norman Jäckel
9fdc050048 Merge pull request #2330 from normanjaeckel/FixAutoupdate
Fixed autoupdate for deleted instances. Fixed #2329.
2016-08-29 16:59:28 +02:00
Norman Jäckel
70dfe8f525 Merge pull request #2331 from emanuelschuetze/issue2182b
Motion config: 'calculate % without abstains' (Fixes #2182)
2016-08-29 16:59:12 +02:00
Emanuel Schuetze
65b0772556 Some clean up and styling work for motion config 'without abstains'.
Manage all config strings in site.js of each app.
2016-08-29 16:40:27 +02:00
Norman Jäckel
3ea46e9dc7 Fixed autoupdate for deleted instances. Fixed #2329. 2016-08-29 16:37:53 +02:00
Emanuel Schuetze
344d9329f9 Added template hook for each poll in assignment detail. 2016-08-29 16:26:13 +02:00
Maximilian Krambach
fc1ce3d90d added option to calculate % based on Yes/No (for motions) (fixes #2182) 2016-08-29 13:07:57 +02:00
Emanuel Schuetze
f0ca4a0d98 Added template hook for assignment poll form. 2016-08-26 06:33:27 +02:00
Emanuel Schütze
6efbe7b210 Merge pull request #2255 from matakuka/search_filter
Added search filtering by category (fixes #2019, fixes #2239)
2016-08-25 17:53:55 +02:00
Maximilian Krambach
e06b4db664 Added search filtering by category (fixes #2019, fixes #2239) 2016-08-25 17:49:36 +02:00
Maximilian Krambach
3221ce18f6 new view for current list of speakers (fixes #2212) 2016-08-25 17:35:57 +02:00
Emanuel Schütze
acf24a26ee Merge pull request #2313 from emanuelschuetze/update-translations
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 17:29:43 +02:00
Maximilian Krambach
126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Emanuel Schuetze
cfdb90f6a7 Updated translations for DE, ES, PT (used by JS, Django). 2016-08-25 09:34:58 +02:00
Emanuel Schuetze
1d0dacbc2d Fixed and updated EN translations. 2016-08-24 16:55:56 +02:00
Emanuel Schuetze
841feaba92 Updated EN translations 2016-08-24 16:04:01 +02:00
Norman Jäckel
e9c5194a17 Merge pull request #2303 from emanuelschuetze/template-hook
Added new template hook for motion detail template.
2016-08-24 09:35:27 +02:00
Emanuel Schütze
5a092710c9 Merge pull request #2286 from FinnStutzenstein/Issue2075
Fixing motion CSV import (fixes #2075, fixes #2165)
2016-08-23 23:17:32 +02:00
Emanuel Schuetze
984282deac Added new template hook for motion detail template. 2016-08-23 23:08:17 +02:00
Finn Stutzenstein
0c5726b5d4 Fixing CSV import (fixes #2075, fixes #2165) 2016-08-22 16:01:57 +02:00
Emanuel Schütze
73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435
New matrix interface for group editing (closes #435)
2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0 Line numbers and inline editing 2016-08-20 11:18:17 +02:00
Norman Jäckel
5ea9cbf4d1 Merge pull request #2289 from emanuelschuetze/motionpdf
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6 Minor motion PDF improvements. 2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8 Merge pull request #2280 from normanjaeckel/TemplateHook
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5 Added template hooks for plugins. 2016-08-19 21:08:54 +02:00
Thomas Junk
92a541215f pdfmake incl. fixes 2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6 PDFMake implemented 2016-08-19 14:10:30 +02:00
Finn Stutzenstein
cd1a2735dc fixes an important typo in category sort 2016-08-19 09:17:28 +02:00
Finn Stutzenstein
ee95af9acc Added a possibility to sort and renumber all motions in a category 2016-08-18 14:54:09 +02:00
Emanuel Schütze
71c3aa5d5e Merge pull request #2273 from normanjaeckel/NumberingCategories
Added possibility to sort motions in category numbering view.
2016-08-17 08:55:19 +02:00
Oskar Hahn
ff658a59c1 The start command uses only one worker (#2271)
Fixes #2198 after https://github.com/andrewgodwin/channels/pull/298 is
part of the next channels release
2016-08-17 07:48:59 +02:00
Norman Jäckel
b0070d13b9 Added possibility to sort motions in category numbering view. 2016-08-16 23:51:12 +02:00
Norman Jäckel
91ebfbac61 Merge pull request #2272 from ostcar/missing_migrations
Added missing migrations for #2269.
2016-08-16 00:22:47 +02:00
Norman Jäckel
aea602acb9 Merge pull request #2256 from ostcar/fix_2248
Only do an autoupdate after an ongoing transaction.
2016-08-16 00:14:15 +02:00
Oskar Hahn
8d58368937 Added missing migrations for #2269 2016-08-15 19:15:05 +02:00
Emanuel Schütze
243ef7ae5d Merge pull request #2257 from FinnStutzenstein/Issue2249
No crash without a browser (fixes #2249)
2016-08-15 09:47:17 +02:00
Oskar Hahn
ee2f6b500b Only do an autoupdate after an ongoing transaction.
This needs at least django 1.9

Fixes: #2248
2016-08-13 10:08:10 +02:00
Oskar Hahn
fac9e71c29 Remove default permissions for session
fixes #2262
2016-08-13 07:37:27 +02:00
Emanuel Schütze
d2c5646ce4 Merge pull request #2254 from matakuka/mini_issues
Repairs assignment ballots for candidates with structure_level
2016-08-09 20:43:33 +02:00
Emanuel Schütze
320de66783 Merge pull request #2261 from emanuelschuetze/config-translations
Fixed missing translations of config options (Fixes #2193)
2016-08-09 20:18:49 +02:00
Emanuel Schuetze
282bc45790 Fixed missing translations of config options (Fixes #2193, fixes #2245) 2016-08-09 17:06:24 +02:00
Norman Jäckel
9813edf490 Merge pull request #2252 from ThomasJunk/mediafix
Added static media handling (Fixes 2223)
2016-08-09 16:03:22 +02:00
Thomas Junk
dec7cb9002 Added static media handling (Fixes #2223)
Now DEBUG compatible

Commit fe64941aab
replaced former use of tornado as webserver with django channels.
During this, the additional routing path for /media/ was forgotten.
This is now fixed.

Due to the routing scheme, the static URLS were added beforehand.
Adding it afterwards does not work.
2016-08-09 14:56:18 +02:00
Finn Stutzenstein
12af0256dd No crash without a browser (fixes #2249) 2016-08-09 08:22:04 +02:00
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