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

3393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oskar Hahn
01eb64c1d2 Update scroll and sale in activate view. 
Fixes #939
 2013-11-07 12:45:17 +01:00
Oskar Hahn
983a373102 Merge pull request #1011 from DerPate/master 
fix issue #933 and Windows like line ends (CRLF)
 2013-11-07 03:26:02 -08:00
Dominik Breu
ce78d1aa7f fix issue #933 and Windows like line ends (CRLF) 2013-11-06 22:51:53 +01:00
Oskar Hahn
929587971a Merge pull request #1006 from normanjaeckel/CheckPort 
Check used port, fix #985.
 2013-11-06 13:03:40 -08:00
Oskar Hahn
2309bd4772 Merge pull request #1004 from ostcar/update_projector_default_slide 
Update projector when the title of the default slide changes
 2013-11-06 12:34:33 -08:00
Oskar Hahn
2f04462947 Merge pull request #1003 from ostcar/participant_update 
Fixed participant edit view
 2013-11-06 12:34:09 -08:00
Oskar Hahn
d32f695fe3 Merge pull request #1002 from ostcar/json-field 
Mention django-jsonfield in the README.rst.
 2013-11-06 12:33:52 -08:00
Norman Jäckel
17a2eb97cb Check used port, fix #985. 2013-11-06 17:49:41 +01:00
Oskar Hahn
cc8b573b62 Update projector when the title of the default slide changes 2013-11-06 17:28:17 +01:00
Oskar Hahn
1ebca3b12e Fixed participant edit view 2013-11-06 17:08:54 +01:00
Oskar Hahn
e2aecc4c4e Mention django-jsonfield in the README.rst. 2013-11-06 16:53:57 +01:00
Oskar Hahn
5040de8dcb Merge pull request #1000 from ostcar/javascript 
Fixed some javascript related problems
 2013-11-06 07:40:51 -08:00
Oskar Hahn
2d07644d3c Fixed some javascript related problems 2013-11-06 14:58:30 +01:00
Oskar Hahn
335bbbec19 Merge pull request #997 from emanuelschuetze/translation-en-1.5 
Updated EN po file for transifex.
 2013-11-06 00:46:56 -08:00
Emanuel Schuetze
97d6cd37b4 Updated EN po file for transifex. 2013-11-06 08:56:40 +01:00
Oskar Hahn
9fdd9740e5 Merge pull request #984 from normanjaeckel/MainTests 
Add some tests.
 2013-11-04 14:43:13 -08:00
Norman Jäckel
7ac40f16f0 Add some tests. 2013-11-04 22:25:03 +01:00
Oskar Hahn
ed48f0d244 Merge pull request #978 from ostcar/MIT 
Change to MIT Licence
 2013-11-04 05:59:18 -08:00
Oskar Hahn
0752d476e4 Change to MIT Licence 
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
 2013-11-04 14:57:30 +01:00
Oskar Hahn
62fc99740f Merge pull request #983 from ostcar/more_tests 
More Tests for projector views
 2013-11-04 05:56:31 -08:00
Oskar Hahn
2691e2b239 More Tests for projector views 2013-11-04 14:53:07 +01:00
Oskar Hahn
1b1cc86c94 Merge pull request #982 from ostcar/test-with-threads 
Mockout threading in the startbrowser test
 2013-11-04 02:40:22 -08:00
Oskar Hahn
eedc5cef5d Mockout threading in the startbrowser test 2013-11-04 08:41:51 +01:00
Oskar Hahn
434f7e6dc4 Merge pull request #977 from ostcar/test_password_hasher 
Set the test passwort hasher to md5
 2013-11-02 15:31:07 -07:00