Commit Graph

1098 Commits

Author SHA1 Message Date
Tomas Groth 13cc26f26a Support for importing Zefania bible XML format
bzr-revno: 2385
2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt 50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly.
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt 0441f0e71b Better description 2014-05-30 19:59:11 +02:00
Tomas Groth d424270b7f Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac. 2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt 873f18ad65 Add test 2014-05-22 15:48:57 +02:00
Samuel Mehrbrodt dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Tomas Groth d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt 854149408f Add test 2014-05-21 17:31:25 +02:00
Samuel Mehrbrodt 5cd2f7ebff Remove tests 2014-05-21 17:31:02 +02:00
Samuel Mehrbrodt 4fadbef196 PEP8 2014-05-21 17:22:13 +02:00
Samuel Mehrbrodt 2462fcf06e Remove test 2014-05-21 17:18:04 +02:00
Samuel Mehrbrodt d1814f05de Add test 2014-05-21 17:17:08 +02:00
Tomas Groth 7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Tomas Groth c0b167ca78 Added tests for import of OpenSong bible format 2014-05-21 11:30:36 +02:00
Tomas Groth 4039cf1103 More tests 2014-05-20 23:54:18 +02:00
Tomas Groth 58179f8d83 Tests 2014-05-20 20:41:07 +02:00
Tomas Groth 37f04c5199 Added simple tests. 2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt 1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt 35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt 97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt 6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Jonathan Springer 1cd9fff9bd Change how we define which menu items are included in the main menu on Mac OS
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified

bzr-revno: 2382
2014-05-11 05:45:30 +01:00
Tim Bentley ec7a7b74fe test 2014-05-10 08:38:38 +01:00
Samuel Mehrbrodt 9dd9f21135 Add an option to display the songbook in the footer
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth 45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Jonathan Springer 13b9a7de72 Add test for the main window function set_service_modified 2014-05-08 10:57:26 -04:00
Jonathan Springer 6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Tim Bentley c6d6be30c6 fix 2014-05-07 21:38:34 +01:00
Tim Bentley dbf2330896 head 2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt 9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Stefan Strasser fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Tim Bentley 1e6f00c2eb Add test 2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt cca1ce57f3 Add test 2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt 3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Tim Bentley f21d3cfa83 fix tests 2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt 37653bfd13 Add missing tag to test 2014-05-03 17:34:13 +02:00
Samuel Mehrbrodt f60379b542 Add new test 2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt b02fc541a3 Reorganize tests 2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt 922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Samuel Mehrbrodt e8c7547ab2 Try to get ccli number even if there is text in the field 2014-05-03 10:47:31 +02:00
Tomas Groth 689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth 5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt b993af2e90 No newline at end of file... 2014-05-02 10:04:11 +02:00
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat 2ba7fa4f44 head 2014-05-01 18:58:32 +02:00
Andreas Preikschat 3f75a913e2 removed not working tests 2014-05-01 18:57:45 +02:00
Samuel Mehrbrodt bdf3109aaa Fix SongShowPlus Import for certain cases
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker eb64c136d0 Deal with empty ccli tag in OpenSong imports 2014-04-30 21:50:57 +01:00
Stewart Becker a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Stewart Becker 4022cff5e5 Fix some issues I ran into when importing our OpenSong 'database' 2014-04-30 21:39:40 +01:00
Andreas Preikschat 0160c583e9 Fix Renderer broken when two option breaks next to each other
bzr-revno: 2374
2014-04-29 17:57:07 +01:00
Andreas Preikschat ff1bc31bfc - Fixed bug #1240037
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts

bzr-revno: 2373
2014-04-29 17:55:30 +01:00
Tomas Groth cc0f0e1eb0 Support for importing ews files (EasyWorship Service files)
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Andreas Preikschat b73d8b088c head 2014-04-29 13:04:32 +02:00
Tomas Groth 48fe8c5e37 Restructured the tests a bit. 2014-04-26 21:47:11 +02:00
Andreas Preikschat 911864a442 removed useless code 2014-04-26 19:31:59 +02:00
Andreas Preikschat 53c584ede4 removed print 2014-04-26 11:26:20 +02:00
Andreas Preikschat 533710fc5b blank line 2014-04-26 11:02:04 +02:00
Andreas Preikschat 6bdadff334 raise exception when item not in list 2014-04-26 11:01:12 +02:00
Andreas Preikschat aa899bfde0 fixes 2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt 20f748d608 Allow authors to be tagged by their type (words music etc)
bzr-revno: 2371
2014-04-26 09:42:26 +01:00
Tim Bentley 9e8f0d82de Add icons to see the state of the remote (on / SSL / authentication)
Stop restarting the server as this crashes it and should not be common.

bzr-revno: 2370
2014-04-26 09:38:44 +01:00
Andreas Preikschat 5a2793bc50 head 2014-04-26 10:19:12 +02:00
Stefan Strasser c2d1589dcb fixed a pep-issue in songs-lib and corrected a comment in a test 2014-04-26 07:07:08 +02:00
Stefan Strasser 1cd7d73d10 fixed bug #1312629 Error on entering invalid character in verse-order
Fixes: https://launchpad.net/bugs/1312629
2014-04-25 22:04:43 +02:00
Tomas Groth bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Stewart Becker 04d5a40542 Fix PEP8 issues 2014-04-22 22:48:48 +01:00
Stewart Becker 6d63a008f0 Merged in from trunk 2014-04-22 22:46:21 +01:00
Stewart Becker d39e1fd4a2 Added comments to OepnSong files and stricter line-break tests 2014-04-22 22:43:12 +01:00
Tomas Groth 074ab4b1bb Head 2014-04-22 22:18:58 +02:00
Tomas Groth 7980231273 Skip tests on windows. 2014-04-22 22:13:36 +02:00
Andreas Preikschat 5a3aecf997 fixed bugs in class 2014-04-22 17:06:21 +02:00
Andreas Preikschat 1ae7c32adb fixed import 2014-04-22 12:32:02 +02:00
Andreas Preikschat 70bce87434 head 2014-04-22 12:30:43 +02:00
Andreas Preikschat 6c08a80bfd added test; refactor 2014-04-22 12:29:15 +02:00
Stewart Becker 7deeefafb4 Remove call used only for debugging 2014-04-21 19:52:42 +01:00
Stewart Becker 9a05c7603a Fixed apostrophe format 2014-04-21 19:42:54 +01:00
Stewart Becker 3e1ed273be Show calls to add_verse for debugging 2014-04-21 19:20:06 +01:00
Stewart Becker 57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +01:00
Stewart Becker e6162e033f Add tests for OpenSongImport, and fixes so that they pass 2014-04-21 16:49:41 +01:00
Jonathan Springer 05171453ea merge trunk 2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt cc0af8845e PEP8 2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt 031868ae31 trunk 2014-04-21 11:49:17 +02: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
Tim Bentley f7ba5ee0e3 head 2014-04-20 21:19:21 +01: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
Tomas Groth 4560d39ad9 head 2014-04-20 20:33:55 +02:00
Tomas Groth a999e59a4f Fixes for merge 2014-04-20 16:36:56 +02: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 79d3e95c32 pep8 fixes 2014-04-20 16:13:09 +02:00
Andreas Preikschat 85c2179102 added test 2014-04-20 16:03:07 +02:00
Tomas Groth f6231e024a Head 2014-04-20 15:57:12 +02:00
Andreas Preikschat c691fc55d0 added a test 2014-04-20 15:00:14 +02:00
Tim Bentley a2c99317c6 fixes 2014-04-19 06:42:45 +01:00
Tim Bentley f48a3346db fixes 2014-04-19 06:29:00 +01:00
Tim Bentley af792941af pep8 again 2014-04-19 06:13:46 +01:00
Tim Bentley 5dc35112c3 pep8 again 2014-04-19 06:09:54 +01: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 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 2c6da0603b Fix tests 2014-04-16 22:33:06 +02: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
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 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
Jonathan Springer 87e1c5d986 Add tests for First Time Wizards web config file 2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt 71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt 4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt 82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Stefan Strasser 5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Jonathan Springer 6c86c9768d Fix typo 2014-04-14 16:01:13 -04:00
Samuel Mehrbrodt e7af43af4a Trunk 2014-04-14 21:46:02 +02:00
Jonathan Springer 97ecc3442f Fix bzt tag test to handle being run from a different directory 2014-04-14 15:45:41 -04:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat 0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Andreas Preikschat 8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat 2c8d163b09 fixed assertion message 2014-04-14 20:59:28 +02:00
Andreas Preikschat 877fd135d3 head 2014-04-14 20:53:33 +02:00
Stefan Strasser 4a4f8c060b Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias) 2014-04-14 20:33:34 +02:00
Raoul Snyman ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox.
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
2014-04-14 19:28:04 +01:00
Jonathan Springer 861f7a8722 Add test to check for proper tags on the current branch.
bzr-revno: 2353
2014-04-14 19:20:48 +01:00
Stefan Strasser 0293815135 Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur 2014-04-13 19:08:38 +02:00
Samuel Mehrbrodt 758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt e0a85a668b Leading whitespace 2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat 4f38ae2809 head 2014-04-13 09:36:42 +02:00
Dmitriy Marmyshev 3cf9094e5f Added ability to rename items in ServiceManager.
bzr-revno: 2352
2014-04-12 23:26:09 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 672eed037c HEAD 2014-04-12 21:48:15 +02:00
Andreas Preikschat 487f4279dd fixed blank line 2014-04-12 19:11:32 +02:00
Andreas Preikschat 321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Andreas Preikschat 2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer 991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer 4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat d16d8066ad - updated vlc.py
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer 307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt 93cd8269f8 Test case 2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt 9da5d290cb Typo 2014-04-10 18:18:25 +02:00
Samuel Mehrbrodt 32f6005c98 Test for OpenLyrics Importer 2014-04-10 09:50:30 +02:00
Tomas Groth f16a781309 Changed the clipselector gui a bit. 2014-04-09 22:24:19 +02:00
Samuel Mehrbrodt ed250c400d Test 2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt 31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt 11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer 25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt e0c6381762 Fix test 2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt 5b3a58d1d6 Add newline 2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt 129f726d4c Rename method 2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt 791fdba019 Fix test 2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt 1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt 1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt 2b8586bf99 Test 2014-04-08 13:19:12 +02:00
Samuel Mehrbrodt b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Tomas Groth aefef04d97 Small fixes. Added checks of start/end times. 2014-04-07 23:08:48 +02:00
Jonathan Springer d3526c6204 Simplify code per Andreas Preikschat's comment. 2014-04-07 13:22:12 -04:00
Samuel Mehrbrodt d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer e19ab7a2c3 Merge trunk 2014-04-06 22:48:24 -04:00
Jonathan Springer c751a208f9 Change back to using a white list. 2014-04-06 22:47:41 -04:00
Tomas Groth bc2d45fc30 Head 2014-04-05 15:27:53 +02:00
Tomas Groth 43f18ee2c9 Added some tests. 2014-04-05 09:46:35 +02:00
Tomas Groth 7dc1b8b759 PEP8 fixes 2014-04-05 09:22:24 +02:00
Tomas Groth 648e0b2290 head 2014-04-05 09:06:30 +02:00
Raoul Snyman 8b2c2f9eef fixed a test 2014-04-04 23:12:44 +02:00
Raoul Snyman 5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tomas Groth 232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
Raoul Snyman d1b867988d missed the test somehow 2014-04-04 22:25:49 +02:00