ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,591 Commits 6 Branches 42 Tags 64 MiB
aea602acb9
Commit Graph

3591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Emanuel Schütze
c06d05a8e6 Merge pull request #2250 from normanjaeckel/FixAutoupdate 
Fixed error in autoupdate. See #2248.
 2016-08-03 21:23:28 +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
Norman Jäckel
fdfdd2e2a5 Merge pull request #2204 from joelmacht/is#2110 
Add tags for assignments (partly fixes Issue #2110)
 2016-08-03 15:54:59 +02:00
joelmacht
19592f1eea Add tags for assingments 2016-08-03 14:48:12 +02:00
Norman Jäckel
51c466f7cf Merge pull request #2242 from matakuka/translations 
translations (fixes #2197)
 2016-08-02 19:03:59 +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
Norman Jäckel
b96d7d0514 Merge pull request #2216 from normanjaeckel/IsCommittee 
Added new user field is_committee and new default group Committees.
 2016-07-29 11:55:00 +02:00
Norman Jäckel
6e241d618e Fixed CHANGELOG. 2016-07-29 11:39:37 +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 Schütze
2d5268609a Merge pull request #2231 from emanuelschuetze/de-translations 
Updated German translations.
 2016-07-27 14:19:40 +02:00
Emanuel Schuetze
8208f44108 Updated German translations. 2016-07-27 14:10:04 +02:00
Emanuel Schütze
152943fe93 Merge pull request #2232 from emanuelschuetze/fix-travis 
Fix travis: upgrade setuptools before install
 2016-07-27 14:09:18 +02:00
Emanuel Schuetze
e980e20042 Fix travis: Upgrade setuptools before install. 
Upgrade setuptools to 18.5+.
Upgrade beautifulsoup4 to 4.5+ to work with latest html5lib.
 2016-07-27 14:00:02 +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
Norman Jäckel
331141c17c Merge pull request #2208 from ostcar/channels-requirement 
Set channel requirement to lower 1.0. We have to use the newest development version
 2016-06-28 17:07:57 +02:00