Commit Graph

2548 Commits

Author SHA1 Message Date
Norman Jäckel
f2c17f1787 Added password hasher settings. Fixed #2354. 2016-09-08 00:13:01 +02:00
Norman Jäckel
4bed8f6c11 Added recommendations for motions.
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
2016-09-07 23:46:38 +02:00
Norman Jäckel
ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
Emanuel Schütze
34f85da1d8 Merge pull request #2352 from FinnStutzenstein/Issue2349
Fixing resolving of Config for projector resolution (fixes #2349)
2016-09-07 20:10:53 +02:00
Norman Jäckel
261b23affa Merge pull request #2326 from tsiegleauq/issue2301
Limit image scale in pdf documents (fixes #2301)
2016-09-06 16:41:58 +02:00
sean
23b7d74890 create ballot papers with pdfmake (fixes #2298) 2016-09-06 16:08:25 +02:00
Finn Stutzenstein
fd78ccdb01 Fixing resolving of Config for projector resolution (fixes #2349) 2016-09-06 12:09:50 +02:00
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