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

3967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Norman Jäckel
e968c88cc1 Update version to 2.0.1-dev 2016-04-17 22:49:17 +02:00
Norman Jäckel
347cf478f8 Release 2.0 2016-04-17 22:49:17 +02:00
Norman Jäckel
a8591c9343 Updated metadata files. 2016-04-17 22:49:17 +02:00
Norman Jäckel
5e487d2f16 Merge pull request #2086 from emanuelschuetze/fixGroups 
Use group_id instead of group in User form views
 2016-04-17 22:48:46 +02:00
Emanuel Schuetze
e0b73ff68a Use group_id instead of group in User form views 2016-04-17 22:42:56 +02:00
Norman Jäckel
a832c757e7 Merge pull request #2085 from emanuelschuetze/css-fix 
Fix z-index of chatbox and projector sidebar.
 2016-04-17 22:23:44 +02:00
Emanuel Schuetze
e151e7c84c Fix z-index of chatbox and projector sidebar. 2016-04-17 22:18:16 +02:00
Norman Jäckel
65c9c3c693 Merge pull request #2083 from emanuelschuetze/responsive 
Template fixes for better smartphone usage.
 2016-04-17 20:50:30 +02:00
Emanuel Schuetze
06d333c067 Template fixes for better smartphone usage. 
- Remove on-focus-me directive on every list view.
  (Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
  on small devices.
- Add z-index for projector sidebar. Show it in full width on small
  devices.
- Remove padding on small devices.
 2016-04-17 19:56:38 +02:00
Norman Jäckel
cbb5f7b567 Merge pull request #2073 from normanjaeckel/Readme 
Readme
 2016-04-15 20:44:04 +02:00
Norman Jäckel
70bcf731b7 Updated README.rst. Added file for DEVELOPMENT instructions. 2016-04-15 19:53:07 +02:00
Emanuel Schütze
6a118eefb2 Merge pull request #2079 from OpenSlides/support-setuptools-20 
Support setuptools 20
 2016-04-15 10:27:34 +02:00
Norman Jäckel
5959b19af2 Merge pull request #2082 from emanuelschuetze/fix2081 
Use always user.groups_id (Fixes #2081)
 2016-04-14 22:59:16 +02:00
Emanuel Schuetze
7ebedb1fdd Use always user.groups_id (Fixes #2081) 
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
 2016-04-14 22:13:28 +02:00
Norman Jäckel
21484c7fdb Merge pull request #2080 from emanuelschuetze/logos 
Reduce sizes of used logos.
 2016-04-13 17:04:58 +02:00
Emanuel Schuetze
9481d037e8 Reduce sizes of used logos. 2016-04-13 11:06:50 +02:00
Oskar Hahn
2ec6bd256c Support setuptools 20 
Fixes #2078
 2016-04-13 09:54:38 +02:00
Norman Jäckel
8d5e983d29 Merge pull request #2077 from emanuelschuetze/translations 
Translations
 2016-04-12 23:47:38 +02:00
Norman Jäckel
84eff37bdc Merge pull request #2076 from emanuelschuetze/fixes 
Last fixes for 2.0
 2016-04-12 23:45:55 +02:00
Emanuel Schuetze
b8194a0b54 Updated all translations (angular-gettext). 2016-04-12 22:58:40 +02:00
Emanuel Schuetze
7229c8dc3a Fix translation strings. 2016-04-12 22:47:46 +02:00
Emanuel Schuetze
7e5ea61b34 Hide candidate list if assignment phase is finished (2). 2016-04-12 22:41:15 +02:00
Norman Jäckel
d37746286c Merge pull request #2074 from emanuelschuetze/bower 
Use angular 1.4.10
 2016-04-12 22:35:10 +02:00
Emanuel Schuetze
f5125d0d23 Add content object (motion/election) in agenda sort view. 2016-04-12 22:33:53 +02:00
Emanuel Schuetze
07d95fd10a Allow to show vote value '0' in motion poll result view. 2016-04-12 22:26:13 +02:00
Emanuel Schuetze
cbfcc6df68 Use angular 1.4.10 2016-04-12 21:57:22 +02:00
Norman Jäckel
8a03c15c35 Merge pull request #2072 from emanuelschuetze/fix2064 
Order of jquery and angular in bower.json is important (Fixes #2064).
 2016-04-11 17:29:29 +02:00
Emanuel Schuetze
642650781c Order of jquery and angular in bower.json is important (Fixes #2064). 
jquery has to load *before* angular! Otherwise ng-model and ng-change doesn't
work with angular-chosen select elements.
 2016-04-11 11:19:59 +02:00
Emanuel Schütze
00fe5a165f Merge pull request #2070 from normanjaeckel/SysExit 
Used exit method from sys library. Fixed #2065.
 2016-04-07 19:51:27 +02:00