Gary Talent
5a36232c93
Add option to import EasyWorship 6 database from any level in the database directory tree.
2017-03-30 19:53:31 -05:00
Gary Talent
76000b4e26
EW6 Importer: Replace appended string paths with os.path.join.
2017-03-30 15:48:23 -05:00
Gary Talent
3f56ca482e
Remove empty lines from EW6 importer methods.
2017-03-30 14:45:38 -05:00
Gary Talent
b4f461c54f
Fix EW6 changes to conform to PEP8.
2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45
Update to trunk.
2017-03-29 16:40:54 -05:00
fc505c2a13
Fix the author_type import properly
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/ ...
bzr-revno: 2730
2017-03-28 11:43:40 -07:00
44f8994080
Fix a problem with loading Qt's translation files, bug #1676163
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1944/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1796/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1522/
[SUCCESS] https://ci.openlp.io/job/Branch ...
bzr-revno: 2729
2017-03-28 11:42:47 -07:00
dce77d2160
Try to figure out why it segfaults on Jenkins but not on my machine
2017-03-27 22:19:33 -07:00
6054f0cae9
Try to figure out why it segfaults on Jenkins but not on my machine
2017-03-27 22:18:04 -07:00
4f6afb71d1
Fix the author_type import properly
2017-03-27 22:15:05 -07:00
815c32b87f
Fix a problem with loading Qt's translation files, bug #1676163
...
Fixes: https://launchpad.net/bugs/1676163
2017-03-27 17:36:54 -07:00
4183f186ce
Various fixes and things:
...
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...
bzr-revno: 2728
2017-03-24 19:33:45 -07:00
84fdab297f
Changed to use plain old SQL
2017-03-22 22:31:51 -07:00
cd733f2901
Fix up a linting issue and removed and unused import in lp-merge.py
2017-03-22 22:12:37 -07:00
659c70b34c
Update changelog
2017-03-22 22:08:14 -07:00
c3f3b36cd3
Removed some unnecessary comments; Updated changelog
2017-03-22 22:07:16 -07:00
a2a51b95dd
Various fixes:
...
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
2017-03-22 21:43:13 -07:00
07ee83b4fe
Pull in refactored merge script
2017-03-22 15:18:13 -07:00
cd7b18ef30
Cleanup BibleImportForm tests
2017-03-22 15:17:43 -07:00
simon.hanna@serve-me.info
0307a1acf5
Minor fix that makes sure that songbeamer files get decoded properly.
...
bzr-revno: 2727
2017-03-13 17:56:42 +00:00
Simon Hanna
e97c157a19
Add comment
2017-03-13 13:43:55 +01:00
Simon Hanna
f7c944acc9
Add test
2017-03-13 13:42:20 +01:00
Simon Hanna
172625b193
Make sure songbeamer songs are decoded correctly
2017-03-13 13:16:12 +01:00
c256477919
Formalise the merge script
2017-03-11 22:48:23 -07:00
05a39cb7ea
Fix a test that was causing a segfault
2017-03-10 16:46:14 -07:00
3d39e2c77d
Ignore a test that is causing a segfault
2017-03-10 16:20:44 -07:00
4bae0fcd69
Fix up two tests
2017-03-10 15:48:59 -07:00
324652c347
Port some bugfixes from 2.4 to trunk
2017-03-09 22:42:38 -07:00
tim.bentley@gmail.com
e5abad85a7
Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
...
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.
lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1921/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1832/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Te ...
bzr-revno: 2726
2017-03-04 17:41:53 +00:00
Tim Bentley
df77c3ebd9
add test
2017-03-04 16:51:51 +00:00
Tim Bentley
0e54621999
test fix
2017-03-04 10:28:07 +00:00
Tim Bentley
c0eb055041
Remove ssl from build
2017-03-04 10:24:53 +00:00
196a6f95f1
Fix bug #1666005 and bug #1668994
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one (revision 2725)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1914/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1825/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1766/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1089/
[...
bzr-revno: 2725
2017-03-02 17:58:46 +00:00
d44244a1e3
Fix bug #1668669 by reducing the height of the settings window
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1668669 (revision 2724)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1909/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1820/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1760/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1494/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-W ...
bzr-revno: 2724
2017-03-02 17:55:25 +00:00
094b1f73bc
Fix a test
2017-03-01 21:43:45 -07:00
3bc6fc0b77
Fix bug #1666005 and bug #1668994
2017-03-01 21:34:24 -07:00
f68336a49f
Make the settings dialog as small as possible
...
Fixes: https://launchpad.net/bugs/1668669
2017-03-01 17:07:16 -07:00
phill.ridout@gmail.com
20398c648f
Merge in regenerated resources
...
bzr-revno: 2723
2017-02-26 07:01:30 +00:00
Philip Ridout
76c2ec8b8c
Regened resources
2017-02-25 17:30:39 +00:00
phill.ridout@gmail.com
cf4b9d4fc1
Bible media item refactors.
...
Added the ability to sort the 'select' aka 'advanced' bible books combo box alphabetically. (note resources will need regen to show the button icon, I'll submit this in another merge proposal to keep this one a tiny bit cleaner.
Lots of Tests!
bzr-revno: 2722
2017-02-24 06:51:43 +00:00
f98c2724c9
Add some more tests for ProjectorDB
...
--------------------------------
lp:~alisonken1/openlp/projectordb_tests (revision 2723)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1897/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1808/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1747/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1483/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1073/
[SUCCESS] https://ci.openlp ...
bzr-revno: 2721
2017-02-19 21:25:15 +00:00
Philip Ridout
74382d1466
Added tool tip
2017-02-18 20:22:47 +00:00
Philip Ridout
04c719e807
Dont try to display search results if there are none!
2017-02-18 08:21:19 +00:00
Philip Ridout
1d377e42cb
Fixed results not showing when using the search button as apposed to search as type!
2017-02-18 08:10:17 +00:00
Philip Ridout
162c178d6e
HEAD
2017-02-18 07:23:15 +00:00
Philip Ridout
f00270d38b
Fixes
2017-02-18 06:52:56 +00:00
e5c5edb157
Remove unneeded mock in projectordb test
2017-01-27 06:44:11 -08:00
6590033945
Oops and pep8
2017-01-27 05:26:36 -08:00
9513ab42bf
Added some more projectordb tests
2017-01-27 05:19:33 -08:00
046bfe493f
Add this to your merge proposal:
...
--------------------------------
lp:~raoul-snyman/openlp/hide-projectors (revision 2719)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1894/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1805/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1744/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1480/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1070/
[SUCCESS] https://ci.openlp.io/ ...
bzr-revno: 2720
2017-01-24 20:59:12 -07:00
