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 |
|
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 |
|
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 |
|
Finn Stutzenstein
|
ee8481768a
|
Update angular-ui-tree (fixes #1717)
|
2016-08-29 09:26:13 +02:00 |
|
Norman Jäckel
|
67c6262c0f
|
Merge pull request #2317 from emanuelschuetze/templateHook-assignment
Added template hook for assignment poll form.
|
2016-08-26 16:13:49 +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 |
|
Emanuel Schütze
|
d23324bf2a
|
Merge pull request #2235 from matakuka/issue2212
Current list of speakers view (fixes #2212)
|
2016-08-25 17:53:14 +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 |
|
Emanuel Schuetze
|
53d5946116
|
Remove old test for checking translation string on server-side.
(Config translations are moved to client-side.)
|
2016-08-25 17:24:07 +02:00 |
|
Emanuel Schütze
|
d4870db662
|
Merge pull request #2268 from matakuka/issue2213
Parent items for Agenda items (fixes #2213)
|
2016-08-25 17:22:54 +02:00 |
|
Maximilian Krambach
|
126cfb9000
|
Parent items for Agenda items (fixes #2213)
|
2016-08-25 13:51:54 +02:00 |
|
Norman Jäckel
|
e63c1438f5
|
Merge pull request #2312 from tsiegleauq/pdfmake_pdfmake
Migrate to pdfmake/pdfmake
|
2016-08-25 12:44:33 +02:00 |
|
Emanuel Schuetze
|
cfdb90f6a7
|
Updated translations for DE, ES, PT (used by JS, Django).
|
2016-08-25 09:34:58 +02:00 |
|
Emanuel Schütze
|
391decc0a3
|
Merge pull request #2311 from emanuelschuetze/translation-fixes
Fixed and updated EN translations.
|
2016-08-25 09:16:10 +02:00 |
|
Sean Engelhardt
|
97b8d39d0b
|
Migrate to pdfmake/pdfmake
|
2016-08-24 17:07:26 +02:00 |
|
Emanuel Schuetze
|
1d0dacbc2d
|
Fixed and updated EN translations.
|
2016-08-24 16:55:56 +02:00 |
|
Emanuel Schütze
|
5afffaba84
|
Merge pull request #2309 from emanuelschuetze/en-translation-strings
Updated EN translations for transifex
|
2016-08-24 16:20:30 +02:00 |
|
Emanuel Schuetze
|
841feaba92
|
Updated EN translations
|
2016-08-24 16:04:01 +02:00 |
|
Norman Jäckel
|
f193d200d0
|
Merge pull request #2305 from emanuelschuetze/readme
Fixed typos and formatting in README.
|
2016-08-24 10:42:27 +02:00 |
|
Norman Jäckel
|
03acd88771
|
Merge pull request #2304 from FinnStutzenstein/Issue2275
Limit the version of djangorestframework (fixes #2275)
|
2016-08-24 10:40:28 +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 Schuetze
|
720307e037
|
Fixed typos and formatting in README.
|
2016-08-24 08:24:23 +02:00 |
|
Finn Stutzenstein
|
4ad625b239
|
Limit the version of djangorestframework (fixes #2275)
|
2016-08-24 08:23:41 +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 |
|
Norman Jäckel
|
81570318b2
|
Merge pull request #2292 from CatoTH/line-numbers-merged
Line numbers and inline editing
|
2016-08-20 11:36:28 +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 |
|