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

4688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
29dc8cf200 Merge pull request #973 from emanuelschuetze/1.5b1-release 
1.5b1 release
 2013-10-29 14:33:32 -07:00
Emanuel Schuetze
4234b46b36 Update version to 1.5-dev 2013-10-29 22:31:43 +01:00
Emanuel Schuetze
efcaffaa02 Release 1.5b1 2013-10-29 22:31:28 +01:00
Emanuel Schuetze
458a6d6d93 Updated CHANGELOG for 1.5b1. 2013-10-29 22:27:54 +01:00
Oskar Hahn
9dfd154e85 Merge pull request #923 from DebVortex/feature/pdf.js 
Included PDF.js and possiblity to show pdfs
 2013-10-29 14:10:09 -07:00
Max Brauer
bd332bd3d5 added possibility to show pdfs on the projector 2013-10-29 22:05:11 +01:00
Oskar Hahn
95ea800958 Merge pull request #969 from emanuelschuetze/motionpdf 
Keep whitespaces in monotype block in motion PDF
 2013-10-29 10:26:02 -07:00
Emanuel Schuetze
ccdf5ef2e0 Motion PDF: Keep whitespaces in monospace <pre> tags and replace it with '&nbsp;'. 2013-10-29 14:57:23 +01:00
Oskar Hahn
558b4e9f86 Merge pull request #966 from normanjaeckel/NewCommandDevSettings 
New command create-dev-settings. Clean up main script. Fix wrong path fo...
 2013-10-29 00:08:16 -07:00
Norman Jäckel
3ec18194fa New command create-dev-settings. Clean up main script. Fix wrong path for Windows version. 2013-10-29 00:48:49 +01:00
Oskar Hahn
c1b5780b97 Merge pull request #968 from emanuelschuetze/Fix943 
Fixed #943: User settings menu button should not run out of the screen
 2013-10-28 14:39:16 -07:00
Emanuel Schuetze
2c4a2b3628 Fixed #943: User settings menu button should not run out of the screen (right side) 2013-10-28 21:43:11 +01:00
Oskar Hahn
cca201d446 Merge pull request #967 from ostcar/fix_projectot_reload 
Fixed reload of javascript
 2013-10-28 13:31:24 -07:00
Oskar Hahn
10bd38d3a5 Fixed reload of javascript 2013-10-28 21:17:32 +01:00
Oskar Hahn
76c0a98ab8 Merge pull request #960 from ostcar/time_format 
Time format
 2013-10-28 13:05:53 -07:00
Oskar Hahn
ffe612359f use the server_time for countdown and clock 2013-10-28 21:05:32 +01:00
Dominik Breu
ef687ad23c Fix for wrong format of clock and countdown on projector 2013-10-28 21:05:28 +01:00
Oskar Hahn
055f73a995 Merge pull request #956 from normanjaeckel/Fix940 
Add error message if a invalid answer was send via POST to a QuestionVie...
 2013-10-28 09:21:58 -07:00
Norman Jäckel
b2afa77e25 Add error message if a invalid answer was send via POST to a QuestionView. Fix #940. 2013-10-28 17:02:18 +01:00
Oskar Hahn
947a976b86 Merge pull request #965 from ostcar/fixed_utils_view_test 
Reenabeld the test for the QuestionView
 2013-10-28 00:54:39 -07:00
Oskar Hahn
466e2ae565 Merge pull request #959 from ostcar/sockjs 
Use sockjs instead of only websocket
 2013-10-28 00:51:21 -07:00
Oskar Hahn
47c60078b3 Use sockjs instead of only websocket 2013-10-27 20:50:10 +01:00
Oskar Hahn
b84197d17b Reenabeld the test for the QuestionView 2013-10-27 16:00:27 +01:00
Oskar Hahn
6f7dabe870 Merge pull request #955 from normanjaeckel/Fix927 
Add message if someone adds himself to the list of speakers. Fix #927.
 2013-10-25 23:59:00 -07:00
Oskar Hahn
e27c746f4a Merge pull request #954 from emanuelschuetze/password-pdf 
Use DIN A4 format and wlan ssid qrcode on access data PDF
 2013-10-25 23:56:21 -07:00
Oskar Hahn
d38606c191 Merge pull request #953 from emanuelschuetze/portable-fix 
Fixed portable build error and updated create_portable.txt
 2013-10-25 23:54:26 -07:00
Oskar Hahn
98667d9479 Merge pull request #952 from emanuelschuetze/zoom 
Improved projector zoom and scroll behaviour.
 2013-10-25 23:53:26 -07:00
Emanuel Schuetze
a513477033 Fixed #948: Use DIN A4 format and wlan ssid qrcode on access data PDF. 2013-10-25 20:51:48 +02:00
Norman Jäckel
218d0bad23 Add message if someone adds himself to the list of speakers. Fix #927. 2013-10-24 18:24:19 +02:00
Emanuel Schuetze
571e3d9efc Fixed portable build error for pillow package. Updated create_portable.txt. 2013-10-24 08:51:12 +02:00
Emanuel Schuetze
84d2619289 Improved projector zoom and scroll behaviour. 
Zoom and scroll the full content div (incl. title and sidebar).
Add zoom and scroll level in projector live view widget.
 2013-10-23 19:44:37 +02:00
Oskar Hahn
7fcc786cf9 Merge pull request #946 from normanjaeckel/FixImport 
Fix #934: Error in motion import with bad csv file.
 2013-10-22 11:48:50 -07:00
Oskar Hahn
4b54bf80b5 Merge pull request #950 from normanjaeckel/Fix949 
Change link in install instruction (Setuptools). Fix #949.
 2013-10-22 11:42:36 -07:00
Norman Jäckel
37e6bfa008 Change link in install instruction (Setuptools). Fix #949. 2013-10-22 17:39:20 +02:00
Norman Jäckel
6175ce25c5 Fix #934: Error in motion import with bad csv file. 2013-10-22 00:18:58 +02:00
Oskar Hahn
b0b91e94c0 Merge pull request #941 from normanjaeckel/UrlNameArgsFix 
Fix url_name_args bug.
 2013-10-21 14:43:45 -07:00
Oskar Hahn
7f4b0d2bb9 Merge pull request #942 from emanuelschuetze/changelog 
Updated Changelog for 1.5b1
 2013-10-21 14:43:15 -07:00
Emanuel Schuetze
63312ce914 Updated Changelog for 1.5b1 2013-10-21 22:54:14 +02:00
Norman Jäckel
9d80c05f90 Fix url_name_args bug. 
Fix delete view for motion categories. Add test for custom slide delete view.
 2013-10-21 22:51:38 +02:00
Oskar Hahn
8303c4444f Merge pull request #933 from emanuelschuetze/requirements 
Requirements
 2013-10-21 12:59:10 -07:00
Oskar Hahn
7e488fdb0c Merge pull request #937 from emanuelschuetze/translation 
Updated EN + DE translation file.
 2013-10-21 12:58:05 -07:00
Emanuel Schuetze
f1a8993452 Used reportlabs qrcode widget (instead of extra qrcode package). 2013-10-21 21:27:07 +02:00
Emanuel Schuetze
66d9d22e27 Updated requirements. 2013-10-21 21:27:07 +02:00
Emanuel Schuetze
d76846e385 Updated EN + DE translation file. 2013-10-21 21:20:55 +02:00
Emanuel Schütze
af14f962df Merge pull request #936 from emanuelschuetze/translation 
Updated EN djanog.po file.
 2013-10-21 11:50:29 -07:00
Emanuel Schuetze
8b8435109b Updated EN djanog.po file. 2013-10-21 20:46:59 +02:00
Oskar Hahn
aa2dfab6aa Merge pull request #935 from normanjaeckel/UrlNameArgs 
Fix missing url_name_args = [] lines in different views.
 2013-10-21 11:00:54 -07:00
Oskar Hahn
54da16d3b0 Merge pull request #924 from normanjaeckel/NewReadme 
Melt INSTALL.txt, THANKS and README.txt to new README.rst
 2013-10-21 10:59:50 -07:00
Norman Jäckel
f74cce96cb Melt INSTALL.txt, THANKS and README.txt to new README.rst. Change metadate for portable version. 2013-10-21 19:46:52 +02:00
Norman Jäckel
b0e3c7d456 Fix missing url_name_args = [] lines in different views. 
Fix custom slide create and update view.
Fix motion category create and update view.
 2013-10-21 19:10:53 +02:00