Commit Graph

1299 Commits

Author SHA1 Message Date
Tomas Groth
d5c9fd33c5 Merge 2.4.x trunk 2016-05-24 12:53:47 +02:00
Tomas Groth
a2b19858b9 pep8 fix 2016-05-16 22:30:33 +02:00
Tomas Groth
935200731c Fix a backported test. 2016-05-16 22:07:11 +02:00
Tomas Groth
a34cbab35c Added support for using the new mutool in mudraw mode 2016-05-09 21:44:14 +02:00
150ced331b Fix test after backport from trunk 2016-05-07 18:15:02 +02:00
dcf78ae592 Update the Transifex API URL 2016-05-05 22:35:04 +02:00
a75953c3d8 Add a test 2016-04-29 22:52:37 +02:00
Samuel Mehrbrodt
ef89796e33 pep8 2016-04-29 19:48:40 +02:00
475ab2af3a "Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514-2.4 (revision 2625)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1502/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1413/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1147/
[SUCCESS] https://ci.op..."

bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 23:26:14 +02:00
411953285d Fix bug #1557514 by autodetecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:45:39 +02:00
ian@knightly.xyz
76f8349e34 Adds QR code and links to the remotes settings for the new iOS app and test to HTML Builder.
lp:~knightrider0xd/openlp/ios-app-2.4 (revision 2627)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1500/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1411/
Currently failing Jenkins interface tests due to unrelated bug, but tested & pep8 passing.

bzr-revno: 2625
2016-04-27 18:00:36 +01:00
Ian Knight
8b893767f8 Testing 2016-04-26 12:17:45 +09:30
Ian Knight
fea43c46b9 Added Test to HTML Builder 2016-04-26 12:13:17 +09:30
Tomas Groth
2c640389f1 Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. Set progress bar steps to number of chapters in zefania import. Fix song tag detection. Fixes bug 1549549. Fix a method call with too many parentheses, which fixes getting bible books from crosswalk. Fix bug that prevents song book entries to be imported. 2016-04-21 21:49:22 +02:00
Tim Bentley
82dae6b128 Add tests 2016-04-03 17:00:12 +01:00
045744dc17 Backport fix for non-standard reply for PJLink class request 2016-03-03 09:15:58 -08:00
Tomas Groth
e99fe71ca2 Added test 2016-02-12 21:23:18 +01:00
dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
second@tgc.dk
8d083af742 More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.

bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth
c75d0cee29 Added a test. 2016-02-06 21:33:27 +01:00
734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +02:00
s.mehrbrodt@gmail.com
8fbd431bed Fix entering Songbooks with keyboard
Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt
0f1c7bae44 Add test 2016-01-30 15:13:35 +01:00
Tomas Groth
f61ac941d0 Mock FormattingTags in test, instead of loading all tags. 2016-01-23 10:53:34 +01:00
Tomas Groth
c1108b1593 Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field. 2016-01-23 09:19:12 +01:00
Tomas Groth
4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth
e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
f588b82976 Fix up the tests for Windows by retrying deleting the databases.
bzr-revno: 2608
2016-01-15 21:37:53 +01:00
478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00
e1ed3ab163 Use rmtree in the retry mechanism 2016-01-15 20:10:09 +02:00
b11b88f4eb Add a retry mechanism 2016-01-15 19:58:21 +02:00
d7b9e2cbe5 Try deleting the file itself after telling Python to do garbage collection 2016-01-15 19:50:57 +02:00
402917024b Another go at this 2016-01-15 19:11:02 +02:00
11b7bfd22d See if waiting a second helps 2016-01-14 22:31:37 +02:00
9e8fe903a7 attempt to fix some tests in windows 2016-01-14 22:25:58 +02:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth
b1660c0525 Added test 2016-01-13 21:56:55 +01:00
Tim Bentley
31d6f931e5 head 2016-01-11 21:58:21 +00:00
Tim Bentley
3f0025a013 add tests 2016-01-11 21:57:45 +00:00
simon.hanna@serve-me.info
98258bc753 Reenable the stylesheet
remove the icons from mediamanager so that display in plasma works

bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00:00
springermac@gmail.com
e6959992f9 Fix Mac OS X display flags test
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X

bzr-revno: 2604
2016-01-11 21:27:11 +01:00
Jonathan Springer
fc2efb7343 Fix Mac OS X display flags test 2016-01-10 22:27:28 -05:00
Jonathan Springer
c07503f5dc Fix import 2016-01-10 17:10:50 -05:00
Jonathan Springer
263a7b2c62 Fix macosx_display_windows_flags_state test 2016-01-10 17:10:05 -05:00
Jonathan Springer
a9df7771f6 Skip OpenOffice test if uno isn't available 2016-01-10 17:09:18 -05:00
Simon Hanna
09faa0cb87 Add a test 2016-01-10 21:06:41 +01:00
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00