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

933 Commits

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