Commit Graph

8302 Commits

Author SHA1 Message Date
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
Oskar Hahn
fbbbdf8caf Merge pull request #976 from normanjaeckel/MoreTests
Add tests. Setup coverage.
2013-10-31 02:56:58 -07:00
Oskar Hahn
a50d2dde39 Set the test passwort hasher to md5 2013-10-31 09:44:21 +01:00
Norman Jäckel
a35d31aaa2 Add tests. Setup coverage. 2013-10-31 01:50:03 +01:00
Oskar Hahn
c5827e0612 Merge pull request #970 from ostcar/test_for_projector
Add tests for the projector code
2013-10-30 10:58:39 -07:00
Oskar Hahn
71666094e7 Add tests for the projector code 2013-10-30 18:58:15 +01:00
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