Finn Stutzenstein
9d3b06c0a6
new change password view ( fixes #2137 )
2016-09-05 07:56:28 +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
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
Norman Jäckel
fac2b694d0
Merge pull request #2284 from ThomasJunk/pdfmake
...
Implement Pdfmake
2016-08-19 17:16:24 +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
Emanuel Schütze
08c734f1a3
Merge pull request #2282 from FinnStutzenstein/Issue2259
...
fixes an important typo in category sort
2016-08-19 09:41:55 +02:00
Finn Stutzenstein
cd1a2735dc
fixes an important typo in category sort
2016-08-19 09:17:28 +02:00
Norman Jäckel
21bbd4706c
Merge pull request #2276 from FinnStutzenstein/Issue2259
...
Added a possibility to sort and renumber all motions in a category (closes #2259 )
2016-08-18 16:59:12 +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
Norman Jäckel
f34621f483
Merge pull request #2270 from ostcar/update_requirements
...
Update requirements
2016-08-13 09:22:37 +02:00
Norman Jäckel
9de7723b7a
Merge pull request #2266 from FinnStutzenstein/Issue2238
...
Downgrade tinymce-dist to 4.3.12 to avoid Issue #2238
2016-08-13 09:17:03 +02:00
Oskar Hahn
46146c6745
Update requirements
...
Also fix min_requirements script
We do not support django 1.10.0 because of this bug:
https://code.djangoproject.com/ticket/26997
This will be fixt with django 1.10.1, see:
https://docs.djangoproject.com/en/1.10/releases/1.10.1/
2016-08-13 09:15:55 +02:00
Norman Jäckel
4e9ff68435
Merge pull request #2269 from ostcar/fix_2262
...
Removed default permissions for session.
2016-08-13 09:13:43 +02:00
Oskar Hahn
fac9e71c29
Remove default permissions for session
...
fixes #2262
2016-08-13 07:37:27 +02:00
Finn Stutzenstein
a22ba2a59d
Downgrade tinymce-dist to 4.3.12 to avoid Issue #2238
2016-08-11 11:58:44 +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