66d7c8fca6
HEAD
2016-07-27 22:48:16 +02:00
Tomas Groth
a3a113021b
Use BibleGateway standard site instead of the legacy site, fixes bug 1562384. Update Crosswalk webpage parser to match new layout, fixes bug 1599999.
...
Fixes: https://launchpad.net/bugs/1562384 , https://launchpad.net/bugs/1599999
2016-07-27 21:27:14 +02:00
f3796fa3d2
Fix the permission error for once and for all
2016-07-19 22:56:31 +02:00
37e92d00a2
Release 2.4.2
...
bzr-revno: 2643
2016-06-25 20:20:19 +02:00
319870aa83
Merge 2.4 base - fix conflicts
2016-06-25 10:32:32 -07:00
second@tgc.dk
a0ac63c31c
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
...
bzr-revno: 2640
Fixes: https://launchpad.net/bugs/1594945
2016-06-22 22:22:26 +02:00
ecdb379082
Bugfix 1593882 and 1593883 - projector authorization backport
...
- Fix exception when authenticated connection requested and pin is None
- Fix pjlink authentication (use python hash instead of qt hash)
- Fix md5_hash functions
- Fix qmd5_hash functions
- Added tests for bugfixes
--------------------------------
lp:~alisonken1/openlp/2.4-bug-1593883-projector-authentication (revision 2637)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1630/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Funct ...
bzr-revno: 2639
Fixes: https://launchpad.net/bugs/1593882 , https://launchpad.net/bugs/1593883
2016-06-22 22:19:24 +02:00
Tomas Groth
867c32165a
merge trunk
2016-06-21 23:01:53 +02:00
second@tgc.dk
9d2da2307f
Fix traceback in VideoPsalm importers traceback handler.
...
Skip PresentationManager files we do not support.
Fix MediaShout import issue when an expected table is missing. Fixes bug 1590657.
Fix traceback during songshowplus import. Fixes bug 1585489.
bzr-revno: 2638
Fixes: https://launchpad.net/bugs/1585489 , https://launchpad.net/bugs/1590657
2016-06-21 22:50:45 +02:00
Tomas Groth
db0cdd372b
Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
...
Fixes: https://launchpad.net/bugs/1594945
2016-06-21 22:06:10 +02:00
7abbb2abb3
bugfix 1593882 and 1593883 backports
2016-06-17 20:18:52 -07:00
Tomas Groth
8057d13db6
Fix traceback during songshowplus import. Fixes bug 1585489.
...
Fixes: https://launchpad.net/bugs/1585489
2016-06-16 22:54:10 +02:00
19a5272e5a
Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.
2016-06-08 11:09:56 +02:00
2dd4c87dde
Bugfix 1588369 - projectorNetwork signal/slot signature mismatch
2016-06-02 23:26:04 -07:00
second@tgc.dk
d8d6917b7d
Fix of tracback during SongPro import. Fixes bug 1582152.
...
Backport of song-search-fix from trunk
Added support for using the new mutool in mudraw mode
Fix crosswalk bible list download
Fix traceback if bible list download fails.
bzr-revno: 2635
Fixes: https://launchpad.net/bugs/1579648 , https://launchpad.net/bugs/1582152
2016-05-24 17:16:57 +01:00
tim.bentley@gmail.com
d6a433c2fc
Fix Android SSL
...
Fix Service Manager
Fix Formatting Tags
Add test
bzr-revno: 2634
2016-05-24 17:15:49 +01:00
Tomas Groth
505e6de924
Merge 2.4.x trunk
2016-05-24 12:58:51 +02:00
Tomas Groth
8a53e4a991
pep8 fixes
...
bzr-revno: 2633
2016-05-24 12:56:51 +02:00
Tomas Groth
d5c9fd33c5
Merge 2.4.x trunk
2016-05-24 12:53:47 +02:00
Tim Bentley
ff541f36ed
with test
2016-05-23 19:26:03 +01: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
4ee29b0e3d
Release 2.4.1
...
bzr-revno: 2630
2016-04-30 21:20:28 +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
895b3bf9b5
Fix slide order change when splitting custom slides. Fixes bug 1554748. Fix EasyWorship import issues with missing verses and traceback on unknown chars. Fix traceback in the bug-report dialog. Fixes bug 1554428. Fix weird test bug in test_pluginmanager.py.
2016-04-21 21:57:00 +02:00
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
271a35581c
Release 2.4
...
bzr-revno: 2621
2016-02-13 16:41:12 +02:00
Tomas Groth
e99fe71ca2
Added test
2016-02-12 21:23:18 +01:00
Tomas Groth
510e109ff5
trunk
2016-02-12 20:59:32 +01:00
Tomas Groth
b90dbbc303
pep8 fix
2016-02-12 20:46:04 +01:00
dcd39adfe2
[songusage] No need to trigger the action twice
2016-02-11 23:05:41 +02:00
a172183a4e
Release 2.3.3
...
bzr-revno: 2617
2016-02-06 23:12:06 +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
4a5f77f884
"Fixed a problem with the shortcuts.
...
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi ..."
bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
2016-02-05 22:04:00 +02:00
0802682a13
Fix up some comments
2016-02-05 21:01:21 +02:00
0dd29893da
More tests
2016-02-04 23:25:06 +02:00
94edb189e8
Added some tests around the shortcut list form
2016-02-04 23:19:01 +02: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
0e8dc032da
Release 2.3.2
...
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
Simon Hanna
0f1d6718bd
Add tests for ignored case
2016-01-10 01:34:53 +01:00
Simon Hanna
70e1f3926b
Add test for fix
2016-01-10 01:18:27 +01:00
s.mehrbrodt@gmail.com
ad37560ecd
lp:~sam92/openlp/multiple-songbooks (revision 2607)
...
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure
bzr-revno: 2600
2016-01-09 19:53:09 +00:00
5a2c3e5abc
Ticket 921817 - exception when connecting using PJLink authentication method
...
Fix incorrect location data when projector instance created.
Fix typo in getting authenticated connection salt setup.
Move salt/pin/test hash to resources file for multiple tests.
Add test for ticket 921817.
Passes local nosetests3 and pep8.
bzr-revno: 2599
2016-01-09 19:44:30 +00:00
d5856f02c6
[Song select] Stop search on viewing a song.
...
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...
bzr-revno: 2598
2016-01-09 19:38:10 +00:00
9904ba8da8
Remove media manager stylesheet for now
2016-01-09 21:10:56 +02:00
a4391bd6e3
HEAD
2016-01-09 20:01:49 +02:00
bcbb523375
pep8
2016-01-09 09:46:20 -08:00
f8d353efcb
Rename test method
2016-01-09 09:43:38 -08:00
94df2d2d86
Fix test for pjlink ticket 921817
2016-01-09 09:21:20 -08:00
8fcae33516
resolve merge conflics
2016-01-09 08:59:42 -08:00
simon.hanna@serve-me.info
04e117181d
Strip whitespace from title when importing a Songbeamer song.
...
bzr-revno: 2596
2016-01-09 16:59:25 +00:00
Simon Hanna
0416e29a83
Merge with trunk
2016-01-09 17:50:08 +01:00
Simon Hanna
afaf54a142
Fix pep8 errors
2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
2785fbaa2d
Fix tests
2016-01-09 16:53:49 +01:00
Samuel Mehrbrodt
ad5246fc4a
songbookentry -> songbook_entry, mock_song -> song
2016-01-09 16:23:11 +01:00
Samuel Mehrbrodt
fe74a19783
Merge
2016-01-09 16:04:34 +01:00
Tomas Groth
e9e845035a
pep8 fixes
2016-01-09 10:09:29 +01:00
Simon Hanna
bf4225838e
Fix failing test due to name conflict
2016-01-09 01:15:23 +01:00
Simon Hanna
21c6a3ff1c
Merge with trunk
2016-01-09 01:07:15 +01:00
