raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,886 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

11886 Commits

Author SHA1 Message Date
Jonathan Springer 6de740333b merge trunk 2014-05-07 18:54:14 -04:00
Jonathan Springer 60fa4c2dca Make vlcplayer stop call asynchronous to aviod a deadlock with the UI thread 2014-05-07 18:52:06 -04:00
Jonathan Springer 41c950b819 merge trunk 2014-05-01 08:53:49 -04:00
Jonathan Springer 13fb4496f3 Change type to conform to expected type 2014-04-23 22:57:02 -04:00
Jonathan Springer 05171453ea merge trunk 2014-04-21 10:46:54 -04:00
Raoul Snyman 5618aaa798 Fix an exception raised when loading media players if the configuration is blank 
bzr-revno: 2369
 2014-04-21 06:39:58 +01:00
Raoul Snyman dee8ed2850 Fix an exception raised when loading media players if the configuration is blank 2014-04-21 00:23:26 +02:00
Andreas Preikschat 328b25dbe8 fix: Bug #1146964 Attach button on exception form does not work 
bzr-revno: 2368
 2014-04-20 22:51:11 +02:00
Jonathan Springer c8d0efe2ea merge trunk 2014-04-20 16:19:41 -04:00
Samuel Mehrbrodt cec163085c Fix bug 1247493: OpenSong Importer fails 
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
 2014-04-20 21:15:21 +01:00
Samuel Mehrbrodt 4253cd4f52 Fix Songbook search 
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
 2014-04-20 16:32:28 +02:00
Andreas Preikschat c691fc55d0 added a test 2014-04-20 15:00:14 +02:00
Andreas Preikschat cec47fc950 fixed bug 1146964 
Fixes: https://launchpad.net/bugs/1146964
 2014-04-20 14:06:02 +02:00
Jonathan Springer e86539888d Fix typo 2014-04-17 20:09:31 -04:00
Samuel Mehrbrodt 9460b39a01 Remove utf8 file 2014-04-17 17:00:28 +02:00
Samuel Mehrbrodt d3443d12c2 Remove one test for now 2014-04-17 16:32:56 +02:00
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Samuel Mehrbrodt 5f86811f82 Fix tests 2014-04-16 23:01:57 +02:00
Jonathan Springer 85fc53954d More PEP8 fixes 2014-04-16 16:49:24 -04:00
Jonathan Springer b6e0aa6c2e PEP8 clean up in tests 2014-04-16 16:44:22 -04:00
Samuel Mehrbrodt 9010e05430 add new openlyrics file 2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt 655ebc009d binary open 2014-04-16 22:37:15 +02:00
Samuel Mehrbrodt 2c6da0603b Fix tests 2014-04-16 22:33:06 +02:00
Jonathan Springer aa6b756956 Change how we define which menu items are included in the main menu on Mac OS X 2014-04-16 16:26:49 -04:00
Jonathan Springer f7a23737f2 merge trunk 2014-04-16 16:26:24 -04:00
Samuel Mehrbrodt dd4e2c8d61 More PEP8 2014-04-16 21:59:34 +02:00
Samuel Mehrbrodt bb1af7ed00 PEP8 2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt aa5a86fba9 Trunk 2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit 
bzr-revno: 2365
 2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt 5929b02586 Test: Songbeamer Authors import 2014-04-16 10:25:17 +02:00
Jonathan Springer cebec89556 merge trunk 2014-04-16 04:00:19 -04:00
Samuel Mehrbrodt c3ed2c02ee Fix bug 1247493 
Fixes: https://launchpad.net/bugs/1247493
 2014-04-16 09:56:37 +02:00
Jonathan Springer ebc4476fdd Fixes first time wizard to use url and paths in web config file 
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
 2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt c20939215a PDF Fixes 
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
 2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt 49773de4f6 Fix transparent theme on OS X 
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
 2014-04-16 05:44:21 +01:00
Andreas Preikschat cb29c78bb0 Print repository name and revision number when using script (especially the revno is interesting for devs) 
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names

bzr-revno: 2361
 2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt be4a654298 More tests 2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt 30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt cd06c994d8 fixed: replacing background with video unblank screen even if it blanked to theme 
bzr-revno: 2360
 2014-04-15 23:00:41 +02:00
Jonathan Springer 90ddde07d4 Fix bzr tag test to handle being run from a different directory 
bzr-revno: 2359
 2014-04-15 22:55:21 +02:00
Samuel Mehrbrodt 5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser db955cbf96 Some enhancements for songbeamer-import 
bzr-revno: 2358
 2014-04-15 22:52:14 +02:00
Jonathan Springer 721bcc20e2 Reorder imports 2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt 8c18659adb Update verse order when verse names change (OpenLyrics Import) 
bzr-revno: 2357
 2014-04-15 22:46:54 +02:00
Andreas Preikschat 06f44be26d get rid of the 2.2.2 tag 
bzr-revno: 2356
 2014-04-15 22:45:17 +02:00
Andreas Preikschat 7a93e821ba use a worker pool to compare songs in the duplicate finder 
bzr-revno: 2355
 2014-04-15 22:43:01 +02:00
Andreas Preikschat 0c474bed44 2014-04-15 22:34:21 +02:00
Andreas Preikschat dbd6d74c8d removed not wanted code 2014-04-15 22:30:20 +02:00
Andreas Preikschat 5090a014ae use self.assert and friends 2014-04-15 22:27:32 +02:00