2326 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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