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

3546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Krambach
589137ece7 add "delete all speakers" button (fixes #2210) 2016-07-28 10:51:33 +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
Maximilian Krambach
649300cfb8 Add a back button to tag overview (Fixed #2151) 2016-06-08 16:41:27 +02:00
Norman Jäckel
a8595ab234 Merge pull request #2185 from tsiegleauq/issue2156 
Fix pagination when agenda got >100 entrys (Fixes #2156)
 2016-06-08 10:45:07 +02:00
Norman Jäckel
13e7e1b1e1 Merge pull request #2176 from tsiegleauq/issue2133 
Limit selection of files to csv and txt (Fixed #2133)
 2016-06-08 10:41:52 +02:00
Sean Engelhardt
235eed1172 Fix pagination when agenda got >100 entrys (Fixes #2156) 2016-06-07 14:17:36 +02:00
Sean Engelhardt
62310c83ae Limit selection of files to csv and txt (Fixed #2133) 
agenda, motions, users csv import
 2016-06-07 11:34:02 +02:00
Oskar Hahn
28584c62f6 Merge pull request #2178 from normanjaeckel/FixMotionPDF 
Fixed motion PDF if motions have no identifier. Fixed #2158.
 2016-06-06 20:51:52 +02:00
Norman Jäckel
294fb7ebc5 Fixed motion PDF if motions have no identifier. Fixed #2158. 2016-06-06 14:26:16 +02:00
Norman Jäckel
03ca4a8174 Merge pull request #2179 from normanjaeckel/FixConfig 
Fixed bug on config view.
 2016-06-06 14:25:31 +02:00
Norman Jäckel
8c5c5dc556 Fixed bug on config view. 2016-06-06 14:19:57 +02:00
Oskar Hahn
f2570551a1 Merge pull request #2175 from ostcar/config 
Redesign of the config variables.
 2016-06-04 01:12:50 +02:00
Oskar Hahn
2221b23447 Redesign of the config variables. 
Removed the config cache and created files for each app in which the
config variables are defined.
 2016-06-03 13:47:54 +02:00
Emanuel Schütze
cab89834ae Merge pull request #2173 from tsiegleauq/issue2132 
Updated German translations (Fixes #2132)
 2016-05-31 15:45:33 +02:00
Sean Engelhardt
d0c9450d02 Updated German translations (Fixes #2132) 2016-05-31 15:00:38 +02:00
Norman Jäckel
6aeba88f09 Merge pull request #2169 from ostcar/fix_2138 
Order speaker on projector
 2016-05-29 19:56:47 +02:00
Oskar Hahn
416c2646fe Order speaker on projector 
fixes #2138
 2016-05-28 19:22:49 +02:00
Emanuel Schütze
61976f47f0 Merge pull request #2144 from normanjaeckel/SettingsFix 
Fixed example text in settings.
 2016-05-28 15:42:17 +02:00
Norman Jäckel
9f22698a23 Merge pull request #2167 from emanuelschuetze/es-translation 
Updated Spanish translation. (Fixes #2094)
 2016-05-25 13:55:08 +02:00
Emanuel Schuetze
80b6dcc971 Updated Spanish translation. 
Thanks to johnfelipe!

Fixed: Define missing Spanish translation in django settings file.
 2016-05-25 09:58:55 +02:00
Norman Jäckel
253d615755 Fixed example text in settings. 2016-05-17 14:16:44 +02:00
Norman Jäckel
08bf53b71e Merge pull request #2101 from lesteenman/fullscreenZIndex2096 
Change the z-index of `.fullscreen` to 199.
 2016-05-17 14:15:49 +02:00
Erik Steenman
c473fc22c0 Fix AUTHORS indentation. 2016-05-14 12:37:58 +02:00
Erik Steenman
4b7ba02b7d Change the z-index of .fullscreen to 100. 
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
 2016-05-10 14:51:30 +02:00
Norman Jäckel
f8c186005a Merge pull request #2087 from emanuelschuetze/readme 
Fixed README typo in 'libjpeg-dev' package.
 2016-04-20 22:37:06 +02:00
Emanuel Schuetze
ab894ec8ca Fixed README typo in 'libjpeg-dev' package. 2016-04-20 21:12:32 +02:00
Norman Jäckel
8548a0390d Merge pull request #2084 from normanjaeckel/Release-2.0 
Release 2.0
 2016-04-17 22:57:18 +02:00