Commit Graph

12348 Commits

Author SHA1 Message Date
Samuel Mehrbrodt
2613ad3076 Don't run upgrades on an up to date database 2014-07-17 23:04:58 +02:00
Samuel Mehrbrodt
5e349c6c24 Merge conflict 2014-07-14 18:50:50 +02:00
Samuel Mehrbrodt
d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt
b2afbd688d Add an importer for PowerPraise
bzr-revno: 2404
2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt
6c40962afb Allow editing of author types and fix bug in servicemanager
bzr-revno: 2403
2014-07-14 17:25:59 +01:00
Samuel Mehrbrodt
0ce859c2cd Fix import 2014-07-14 13:36:33 +02:00
Tomas Groth
dc4c9f389b pep8 fix 2014-07-14 09:27:38 +02:00
Tomas Groth
15ca94554b Updated jenkins script to match tests 2014-07-14 09:21:36 +02:00
Tomas Groth
29f8eedeaf Merged with trunk and reverted changes to the tag test 2014-07-14 09:19:47 +02:00
Samuel Mehrbrodt
af64bece26 Improve Song Copyright
bzr-revno: 2402
2014-07-13 21:57:05 +01:00
a670724ebe Fix tags test to work with cross repo flags
bzr-revno: 2401
2014-07-13 21:56:02 +01:00
563fb794b5 Added an explanatory comment 2014-07-13 21:21:50 +02:00
a753bb38f3 Add Info Panel to Controllers and lots of tests.
bzr-revno: 2400
2014-07-13 14:19:10 +01:00
63350ab6eb Try to ignore the 2.0.x line of tags 2014-07-13 15:10:58 +02:00
ba9ff89354 [fix] PEP8 error: no whitespace 2014-07-13 13:04:37 +02:00
f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Samuel Mehrbrodt
79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Samuel Mehrbrodt
53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Samuel Mehrbrodt
7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt
6d5e6f0faf Remove debug output 2014-07-09 14:45:54 +02:00
Samuel Mehrbrodt
79009a1a7f Add test 2014-07-09 14:41:55 +02:00
Samuel Mehrbrodt
383f7ef6e2 Option for displaying copyright symbol 2014-07-09 14:33:26 +02:00
Samuel Mehrbrodt
8c2a86580f Merge trunk 2014-07-09 14:19:51 +02:00
Samuel Mehrbrodt
c1df88693d Revert changes 2014-07-09 14:19:32 +02:00
Tim Bentley
b546b6b825 head 2014-07-08 19:05:24 +01:00
Tomas Groth
fdded5adc2 Fix tag tests 2014-07-07 19:28:27 +02:00
Tomas Groth
e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Tomas Groth
e6f5136708 Suggested changes to tests 2014-07-07 19:22:58 +02:00
Samuel Mehrbrodt
b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt
df6669220a Space 2014-07-07 18:17:54 +02:00
Samuel Mehrbrodt
2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Tomas Groth
695079dd00 Improve powerpoint error handling.
bzr-revno: 2399
2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt
520c251923 Cleanup: Move song import plugins into subfolder
bzr-revno: 2398
2014-07-07 17:08:32 +01:00
Tim Bentley
2770c76895 Fix setup.py for python3 to remove binary strings.
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.

bzr-revno: 2397
2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt
398508f49b Gui entry 2014-07-07 15:36:07 +02:00
Samuel Mehrbrodt
b7a141f75c Add Presentation Manager import
Fixes: https://launchpad.net/bugs/957017
2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt
201cfad9c4 Remove unused imports 2014-07-07 14:25:00 +02:00
Tomas Groth
bec0071e7c Small adjustments 2014-07-07 13:30:03 +02:00
Samuel Mehrbrodt
b92ca3f209 Fix service up movement
Fixes: https://launchpad.net/bugs/1338316
2014-07-07 13:17:24 +02:00
Tomas Groth
32ff9cdeb7 Patch by Samuel 2014-07-06 21:48:23 +02:00
Tim Bentley
2938df5e02 remove german 2014-07-06 16:19:12 +01:00
Samuel Mehrbrodt
8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt
5d7b60f714 Changing Author type functional 2014-07-05 21:56:32 +02:00
Samuel Mehrbrodt
cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt
aec5a8546b Merge trunk 2014-07-04 16:16:14 +02:00
Samuel Mehrbrodt
7f9ae1374e Started authortype editing
Fixes: https://launchpad.net/bugs/1336933
2014-07-04 16:16:02 +02:00
Samuel Mehrbrodt
60f11d9173 Always display copyright symbol in footer 2014-07-04 13:18:14 +02:00
Samuel Mehrbrodt
0fb445e117 PEP8 2014-07-04 11:36:54 +02:00
Samuel Mehrbrodt
f089e7522e Cleanups 2014-07-04 11:35:10 +02:00
Samuel Mehrbrodt
686f8d2437 More renaming 2014-07-04 11:31:06 +02:00