Norman Jäckel
|
b661a6e215
|
Merge pull request #2370 from normanjaeckel/Issue2315
Migration for new permission matrix
|
2016-09-08 13:20:49 +02:00 |
|
Norman Jäckel
|
25d3b6d552
|
Merge pull request #2368 from matakuka/motionComment
Moved MotionComment factory to base.js.
|
2016-09-08 12:00:10 +02:00 |
|
Norman Jäckel
|
cd3c470919
|
Changed migration coding style.
|
2016-09-08 11:40:58 +02:00 |
|
Maximilian Krambach
|
bcd15d2691
|
moved MotionComment factory to base.js
|
2016-09-08 11:25:03 +02:00 |
|
Emanuel Schuetze
|
9ed37c00af
|
Fixes and template improvements for motion comments.
Fixed erros while creating motion as anonymous user.
|
2016-09-08 11:18:56 +02:00 |
|
Emanuel Schütze
|
a0acf75f08
|
Merge pull request #2366 from normanjaeckel/FixTemplateHooks
Fixed bug in templateHook directive. Fixed #2362.
|
2016-09-08 10:26:15 +02:00 |
|
Finn Stutzenstein
|
4ffe2b5a80
|
Migration for new permission matrix
|
2016-09-08 08:38:17 +02:00 |
|
Norman Jäckel
|
1cdcad7d47
|
Fixed bug in templateHook directive. Fixed #2362.
|
2016-09-08 00:58:02 +02:00 |
|
Norman Jäckel
|
f6ece5f6b3
|
Merge pull request #2365 from normanjaeckel/FixSettings
Added password hasher settings. Fixed #2354.
|
2016-09-08 00:25:01 +02:00 |
|
Norman Jäckel
|
f2c17f1787
|
Added password hasher settings. Fixed #2354.
|
2016-09-08 00:13:01 +02:00 |
|
Norman Jäckel
|
f2c3e535a5
|
Merge pull request #2344 from normanjaeckel/MotionRecommendation
Added recommendations for motions.
|
2016-09-07 23:58:14 +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
|
41cb8b37cd
|
Merge pull request #2283 from normanjaeckel/MotionComments
Added generic fields for comments for motions.
|
2016-09-07 22:11:59 +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 |
|
Norman Jäckel
|
b880217357
|
Merge pull request #2325 from tsiegleauq/issue2298
create ballot papers with pdfmake (fixes #2298)
|
2016-09-06 16:16:48 +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 Schütze
|
2c8ab64e9b
|
Merge pull request #2355 from CatoTH/line-break-bugfixes
Bugfixes: line numbering
|
2016-09-05 23:15:26 +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
|
54dd21dce0
|
Merge pull request #2336 from normanjaeckel/SerializerRefactoring
Refactored user serializers for different client permissions. See #1871.
|
2016-09-05 15:31:17 +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 |
|
Norman Jäckel
|
d383aec23a
|
Merge pull request #2345 from matakuka/fullscreenicon
New fullscreen icon (fixes #2316)
|
2016-09-05 13:37:07 +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 |
|
Norman Jäckel
|
8974ce60a8
|
Merge pull request #2340 from emanuelschuetze/event-name
Increase the allowed characters for event name config to 100.
|
2016-09-01 23:50:26 +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 |
|
Norman Jäckel
|
2488b8788b
|
Fixed tests.
|
2016-08-31 12:35:10 +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
|
30c4c893a8
|
Merge pull request #2328 from FinnStutzenstein/Issue1717
Update angular-ui-tree (fixes #1717)
|
2016-08-29 20:30:07 +02:00 |
|
Emanuel Schütze
|
2a436720f7
|
Merge pull request #2333 from normanjaeckel/FixGroupOptions
Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fi…
|
2016-08-29 18:36:15 +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 Schütze
|
ad9181182f
|
Merge pull request #2332 from emanuelschuetze/assignmentDetailHook
Added template hook for each poll in assignment detail.
|
2016-08-29 16:41:35 +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 |
|