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

2517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
881fd562a1 Add tests according to issue #931. 2013-11-14 19:29:08 +01:00
Norman Jäckel
879e073478 Sort requirements, fix #1031. 2013-11-14 18:36:00 +01:00
Oskar Hahn
ffb63f43a3 Merge pull request #1057 from normanjaeckel/TransAssignmentString 
Verbose name of Assignment inserted, fixed #1036
 2013-11-14 06:41:02 -08:00
Oskar Hahn
0041b5de57 Merge pull request #1053 from andkit/fix-1043 
Set reuse address option (fixes #1043)
 2013-11-14 05:27:36 -08:00
Oskar Hahn
506d9a256d Merge pull request #1049 from DebVortex/feature/fix-issue-1041 
Bugfix in agenda.js (fixes #1041)
 2013-11-14 05:25:17 -08:00
Norman Jäckel
5f948f9e79 Verbose name of Assignment inserted, fixed #1036 
It is neccessary to refresh the database table for the content types, e. g. by deleting the database and runing syncdb.
 2013-11-13 19:30:04 +01:00
Andy Kittner
2a73d9f7ee Set reuse address option (fixes #1043) 
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
 2013-11-12 22:00:47 +01:00
Max Brauer
091a2bc35c Bugfix in agenda.js (fixes #1041) 2013-11-12 21:33:57 +01:00
Oskar Hahn
728a33f5c3 Merge pull request #1021 from DebVortex/feature/fix-issue-994 
fixes #994: store collapsed and fixed of widets in cookie, too.
 2013-11-12 05:36:08 -08:00
Max Brauer
c7afce30a1 fixes #994: store collapsed and fixed of widets in cookie, too. 2013-11-12 14:29:48 +01:00
Oskar Hahn
c4c9483b5e Merge pull request #1046 from emanuelschuetze/translation-fix 
Fixed typo (titel->title).
 2013-11-12 05:07:45 -08:00
Oskar Hahn
d9cf05ef55 Merge pull request #1042 from emanuelschuetze/1.5b2-fixes 
1.5b2 fixes
 2013-11-12 05:07:17 -08:00
Oskar Hahn
77c0e20c96 Merge pull request #1045 from ostcar/issue_1035 
Fixed agenda slide
 2013-11-12 03:16:58 -08:00
Emanuel Schuetze
b8e30188ad Fixed #1040: Show only last motion poll results on projector. 2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb Fixed typo (titel->title). 2013-11-12 10:57:07 +01:00
Oskar Hahn
9d8d9f806f Fixed agenda slide 
Fixes #1035
 2013-11-12 08:59:20 +01:00
Emanuel Schuetze
2034852fa8 Fixed #1038: Increase small input fields in poll forms. 2013-11-11 17:36:52 +01:00
Emanuel Schuetze
92b111c0bd Fixed #1039: Motion poll edit view: projector icon needs 'if slide is activate' check. 2013-11-11 17:36:12 +01:00
Norman Jäckel
09ac5d0eb5 Merge pull request #1033 from emanuelschuetze/1.5b2-release 
1.5b2 release
 2013-11-10 14:13:14 -08:00
Emanuel Schuetze
a5e8737b85 Update version to 1.5c1-dev 2013-11-10 23:05:55 +01:00
Emanuel Schuetze
9c2f9c62c2 Release 1.5b2 2013-11-10 23:05:55 +01:00
Norman Jäckel
a6dd5bb5ea Merge pull request #1030 from emanuelschuetze/changelog 
Updated changelog for 1.5b2.
 2013-11-10 14:01:42 -08:00
Emanuel Schuetze
43eebb9278 Updated changelog for 1.5b2. 2013-11-10 22:59:46 +01:00
Norman Jäckel
4446343401 Merge pull request #1024 from normanjaeckel/FixUnicodeEncodeError 
Use encoded string for insert in sys.path during main script. Fix #1022.
 2013-11-10 13:49:56 -08:00
Norman Jäckel
84a2fa41f0 Merge pull request #1029 from normanjaeckel/RepairDjangoUpdate 
Move run_tornado import into runserver function because its imports need...
 2013-11-10 13:21:32 -08:00
Norman Jäckel
cc0298eaa0 Use encoded string for insert in sys.path and print during main script. Fix #1022. 2013-11-10 22:21:14 +01:00
Norman Jäckel
c4850e4b19 Move run_tornado import into runserver function because its imports needs settings (new in Django 1.6). 2013-11-10 22:15:13 +01:00
Norman Jäckel
9ae62ca285 Merge pull request #1028 from emanuelschuetze/translations 
Updated translations (DE, PT, CS).
 2013-11-10 13:12:56 -08:00
Emanuel Schuetze
0a2c73842a Updated translations (DE, PT, CS). 2013-11-10 21:56:07 +01:00
Norman Jäckel
d2309cbe49 Merge pull request #1026 from normanjaeckel/EnglishTransFile 
Update English translation files.
 2013-11-10 12:27:09 -08:00
Norman Jäckel
7b45231211 Merge pull request #1001 from ostcar/django1.6 
Update to Django 1.6
 2013-11-10 12:26:06 -08:00
Norman Jäckel
ec0a27e545 Update English translation files. 2013-11-10 21:13:57 +01:00
Norman Jäckel
7914121a17 Merge pull request #1009 from emanuelschuetze/1.5c1-fixes 
Template fixes
 2013-11-10 11:58:46 -08:00
Emanuel Schuetze
1fb0a21d0b Some more template fixes: 
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
  * Search bar with same border-radius like login button.
  * Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
  * Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
 2013-11-10 20:50:30 +01:00
Norman Jäckel
c5bdd67dc4 Merge pull request #1019 from emanuelschuetze/several-1.5-fixes 
Template improvements and translation strings
 2013-11-10 11:44:09 -08:00
Emanuel Schuetze
34701c67a6 Template improvements. 
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
 2013-11-10 20:27:38 +01:00
Norman Jäckel
f243ca8977 Merge pull request #1020 from DerPate/fix_licens 
Add html5lib-python license.
 2013-11-10 10:59:48 -08:00
Dominik Breu
4672d98d76 add missing license html6lib-python 2013-11-10 19:54:20 +01:00
Norman Jäckel
8239b80668 Merge pull request #1018 from emanuelschuetze/fix957 
Extend css style optinos in CKEditor
 2013-11-10 10:48:42 -08:00
Emanuel Schuetze
45588024fd Fixed #957 (Allow list-style in CKEditor) 
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
 2013-11-10 19:33:38 +01:00
Oskar Hahn
7bc0f5a5dc Merge pull request #1015 from andkit/fix-821 
Add correct wxpython version to PACKAGES.txt (fixes #821)
 2013-11-10 08:32:32 -08:00
Oskar Hahn
31729534fa Merge pull request #1016 from emanuelschuetze/fix897 
Use correct server time for all clients
 2013-11-10 08:32:16 -08:00
Oskar Hahn
bb9d700a22 Merge pull request #1013 from ostcar/SlideError 
Show default_slide if an error occurs in a slide
 2013-11-10 08:21:37 -08:00
Emanuel Schuetze
3b8c8145d7 Fixed #897 (Use correct server time for clock/countdown on other clients) 2013-11-09 21:28:45 +01:00
Oskar Hahn
2a7a50a817 Show default_slide if an error occurs in a slide 
See #925
 2013-11-09 15:14:55 +01:00
Andy Kittner
f7d2e8aaad Add correct wxpython version to PACKAGES.txt (fixes #821) 2013-11-09 00:03:21 +01:00
Oskar Hahn
ab048e3393 Update to Django 1.6 2013-11-07 18:56:06 +01:00
Oskar Hahn
e92af391c3 Merge pull request #1005 from ostcar/activate_view 
Update scroll and sale in activate view.
 2013-11-07 09:53:34 -08:00
Oskar Hahn
5fff885c89 Merge pull request #1012 from ostcar/issue_998 
removed unused javascript. Fixes #998
 2013-11-07 08:03:42 -08:00
Oskar Hahn
fe68fffdda removed unused javascript. Fixes #998 2013-11-07 13:53:33 +01:00