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

3392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
ca3cfae8b3 Changed name of '--development' option and name of the respective directory. Fixed #2001 2016-03-01 17:38:14 +01:00
Emanuel Schütze
8d1de6923b Merge pull request #2017 from normanjaeckel/FixMotionPoll 
Fixed error in motion poll serializer. Fixed #2014.
 2016-02-28 00:21:04 +01:00
Norman Jäckel
bc49f00c66 Fixed error in motion poll serializer. Fixed #2014. 2016-02-27 21:34:26 +01:00
Norman Jäckel
872d73b5cf Merge pull request #2016 from normanjaeckel/GetContext 
Rename and refactor some ProjectorElement methods. Fixed #1631.
 2016-02-27 21:24:18 +01:00
Norman Jäckel
ea429adefe Merge pull request #2015 from emanuelschuetze/fix2009 
Show special vote values for motion polls on projector.
 2016-02-27 20:57:21 +01:00
Norman Jäckel
a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Emanuel Schuetze
1d314db487 Show special vote values for motion polls on projector. 2016-02-27 20:10:24 +01:00
Norman Jäckel
452e7f1325 Merge pull request #2011 from ostcar/fix_requirements.txt 
Updated requirements_production.txt
 2016-02-27 00:20:46 +01:00
Norman Jäckel
d00c257ee8 Merge pull request #1998 from normanjaeckel/HelpText 
Updated start script help text and custom commands. Fixed #1987.
 2016-02-27 00:18:45 +01:00
Oskar Hahn
099ff5a681 Updated requirements_production.txt 
reportlab 3.3 can be used
sockjs-tornado 1.0.0 is not usable. We need at least 1.0.1
 2016-02-26 09:10:21 +01:00
Norman Jäckel
9fbb12944c Updated start script help text and custom commands. Fixed #1987. 2016-02-25 23:17:04 +01:00
Emanuel Schütze
2b239f2214 Merge pull request #2003 from emanuelschuetze/fix1820 
Reload after login and logout (Fixes #1820)
 2016-02-25 13:51:44 +01:00
Emanuel Schütze
c9cc8e236e Merge pull request #2002 from emanuelschuetze/fixes2 
Template improvements
 2016-02-25 13:45:28 +01:00
Emanuel Schuetze
a6be43809f Agenda list slide improvements 
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
 2016-02-25 13:37:59 +01:00
Emanuel Schuetze
d3d73a019d Fix translations in group detail template. 2016-02-25 13:37:55 +01:00
Emanuel Schuetze
06f7515ca4 Reload after login and logout (Fixes #1820) 
Not very nice solution but with DS.clear() we have to do a lot of more
work with high effort. Can improved later.
 2016-02-25 10:22:05 +01:00
Emanuel Schütze
88b2e8a73e Merge pull request #2000 from normanjaeckel/VotesQuery 
Optimized number of queries for motion serializing. Fixed #1655.
 2016-02-24 11:10:11 +01:00
Emanuel Schütze
8b5b53f26e Merge pull request #1999 from normanjaeckel/JSHint 
Fixed coding style in some JS files. Fixed #1979.
 2016-02-24 11:08:21 +01:00
Norman Jäckel
758180e7cc Optimized number of queries for motion serializing. Fixed #1655. 2016-02-24 10:30:52 +01:00
Norman Jäckel
544b28cacf Fixed coding style in some JS files. Fixed #1979. 2016-02-24 09:56:27 +01:00
Norman Jäckel
e57a83f45b Merge pull request #1997 from emanuelschuetze/fix1817 
Get success message in user edit form when default password is resetted
 2016-02-24 00:45:05 +01:00
Emanuel Schütze
0cbb3fba01 Merge pull request #1996 from normanjaeckel/LanguageHeader 
Added language header to internal server requests. Fixed #1981.
 2016-02-23 23:54:44 +01:00
Emanuel Schuetze
bed96f66b0 Get success message in user edit form when default password is resetted (Fixes #1817). 2016-02-23 23:51:42 +01:00
Norman Jäckel
73cc1a5dfb Merge pull request #1995 from emanuelschuetze/fix1991 
Add/Remove a group to selected users (Fixes #1991)
 2016-02-23 23:37:57 +01:00
Norman Jäckel
3ea4c507cf Added language header to internal server requests. Fixed #1981. 2016-02-23 23:19:38 +01:00
Emanuel Schuetze
e284b79c8e Add/Remove a group to selected users (Fixes #1991) 2016-02-23 23:16:13 +01:00
Emanuel Schütze
ca5f707f74 Merge pull request #1994 from normanjaeckel/FileNotFound 
Fixed error if a PDF file was deleted from the server. Fixed #1988.
 2016-02-23 22:44:35 +01:00
Norman Jäckel
9a94dfc735 Merge pull request #1993 from emanuelschuetze/fix1710 
Added motion poll pdf (Fixes #1710).
 2016-02-23 22:38:28 +01:00
Norman Jäckel
eecfc45dce Merge pull request #1992 from emanuelschuetze/fixes1 
Several template fixes
 2016-02-23 22:36:50 +01:00
Norman Jäckel
e8402f6ffa Fixed error if a PDF file was deleted from the server. Fixed #1988. 2016-02-23 22:35:04 +01:00
Emanuel Schuetze
eebb621a98 Added motion poll pdf (Fixes #1710). 2016-02-23 22:27:03 +01:00
Emanuel Schuetze
16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
70dc8443fd Revert one change from #1984 in CHANGLOG. (Fixes #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
0613304724 Use colorpicker for projector header color config. 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
ba49781b39 Show orange countdown in last x seconds of speaking time (add new config) 2016-02-23 22:24:38 +01:00
Emanuel Schuetze
647e62fb0d Set focus for chat input 2016-02-23 22:24:33 +01:00
Emanuel Schuetze
150744e607 Fixed showing users filters. 2016-02-20 11:35:51 +01:00
Emanuel Schuetze
b0b858a808 Mediafile PDF controls: set 'page-fit' (100%) by default, disabled previous/next buttons 2016-02-20 11:29:38 +01:00
Emanuel Schütze
4016c1ea4b Merge pull request #1985 from emanuelschuetze/release2.0b4 
Release 2.0b4
 2016-02-17 21:27:18 +01:00
Emanuel Schuetze
de276d951c Update version to 2.0b5-dev 2016-02-17 21:24:14 +01:00
Emanuel Schuetze
51358aba51 Release 2.0b4 2016-02-17 21:24:14 +01:00
Emanuel Schütze
41d9706a35 Merge pull request #1986 from emanuelschuetze/fixCSVimport 
Fix motions and users csv import.
 2016-02-17 21:23:28 +01:00
Emanuel Schuetze
0e40735931 Fix motions and users csv import. 2016-02-17 21:19:26 +01:00
Emanuel Schütze
7391771316 Merge pull request #1984 from emanuelschuetze/changelog 
Updated CHANGELOG
 2016-02-17 20:42:28 +01:00
Emanuel Schütze
ecb29a1403 Merge pull request #1980 from normanjaeckel/PluginAPI 
Updated API for plugins.
 2016-02-17 20:40:40 +01:00
Emanuel Schütze
fde94c6af1 Merge pull request #1983 from emanuelschuetze/updateTranslations 
Updated all lanuages (JS only)
 2016-02-17 20:39:37 +01:00
Emanuel Schuetze
dcb12e60c7 Updated CHANGELOG 2016-02-17 20:38:29 +01:00
Emanuel Schuetze
8c4d1e24df Updated all lanuages (JS only) 2016-02-17 20:18:45 +01:00
Emanuel Schütze
2dd0013047 Merge pull request #1982 from emanuelschuetze/fixes 
Several important fixes for beta4
 2016-02-17 19:52:59 +01:00
Emanuel Schuetze
2473a6ef69 Updated angular-gettext EN source. 2016-02-17 17:58:04 +01:00