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

3771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oskar Hahn
315738acef Set channel requirement to lower 1.0. We have to use the newest development version 2016-06-28 15:29:49 +02:00
Sean Engelhardt
520f8362fa Add translatable entries for QuickEdit (Fixes #2164) 2016-06-28 14:06:46 +02:00
Emanuel Schütze
9c1e8a86a4 Merge pull request #2206 from emanuelschuetze/translation-updates 
Fixed and update English translation strings.
 2016-06-28 14:05:25 +02:00
Emanuel Schuetze
31657d0cf3 Fixed and update English translation strings. 2016-06-28 10:18:43 +02:00
Emanuel Schütze
99306a745b Merge pull request #2203 from emanuelschuetze/translations 
Updated EN source translation files.
 2016-06-20 21:44:32 +02:00
Emanuel Schuetze
31c509f288 Updated EN source translation files. 2016-06-20 21:03:43 +02:00
Norman Jäckel
d4309cbeb3 Merge pull request #2201 from normanjaeckel/Style 
Fixed coding style.
 2016-06-17 20:02:04 +02:00
Norman Jäckel
8e297e4a9a Silenced flake 8 errors. Fixed #2202. 2016-06-16 11:03:16 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Norman Jäckel
5be8499bb4 Merge pull request #2194 from matakuka/issue-2093 
Config translations moved to client side (Issue #2093)
 2016-06-16 10:25:52 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Emanuel Schütze
7a94b6511b Merge pull request #2189 from matakuka/YesNoVotes 
adding option "yes/no for each candidate"
 2016-06-12 11:11:10 +02:00
Norman Jäckel
1afe3572e4 Merge pull request #2190 from joelmacht/issue#2147 
Fix linebreak on tags (Fixes #2147)
 2016-06-11 21:17:56 +02:00
Joel Macht
b7d83e786f Fix linebreak on tags, add spacing and remove commas (Fixes #2147) 2016-06-10 18:17:42 +02:00
Maximilian Krambach
3157ac59f2 adding option "yes/no for each candidate" 2016-06-10 14:13:01 +02:00
Oskar Hahn
9a88717dab Merge pull request #2170 from ostcar/channels 
Big Mode for OpenSlides
 2016-06-09 11:20:25 +02:00
Oskar Hahn
fe64941aab Big Mode for OpenSlides 
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
 2016-06-09 11:14:39 +02:00
Norman Jäckel
dbbaeb245c Merge pull request #2191 from matakuka/issue2181 
typo fixing (issue #2181)
 2016-06-08 22:56:29 +02:00
Maximilian Krambach
5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Norman Jäckel
c55bf5f524 Merge pull request #2183 from matakuka/issue-2151-b 
Add a back button to tag overview (Fixed #2151)
 2016-06-08 21:14:51 +02:00