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

14663 Commits

Author SHA1 Message Date
Tomas Groth 55f63a0a0f Only convert bracket tags to chords for songs. 2017-04-25 16:41:35 +02:00
Tomas Groth f1b34efcac More tests. 2017-04-21 21:40:28 +02:00
Tomas Groth 536a919675 Hide transpose buttons if chords are disabled, and check for invalid chords on verseedit close. 2017-04-20 22:23:17 +02:00
Tomas Groth 6e9520c8b0 Fixed serviceitem test 2017-04-19 21:37:08 +02:00
Tomas Groth d36d576dc9 Added another chord test. 2017-04-18 21:20:36 +02:00
Tomas Groth fa9cdc5b94 Added songbeamer chord import test 2017-04-17 21:35:34 +02:00
Tomas Groth 5187b7b945 Added some tests and fixed a bug. 2017-04-11 14:44:28 +02:00
Tomas Groth c97aaab763 Fix an issue with songbeamer import where chords were pushed a line. 2017-04-11 10:43:45 +02:00
Tomas Groth 111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman dce77d2160 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:19:33 -07:00
Raoul Snyman 6054f0cae9 Try to figure out why it segfaults on Jenkins but not on my machine 2017-03-27 22:18:04 -07:00
Raoul Snyman 4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 84fdab297f Changed to use plain old SQL 2017-03-22 22:31:51 -07:00
Raoul Snyman cd733f2901 Fix up a linting issue and removed and unused import in lp-merge.py 2017-03-22 22:12:37 -07:00
Raoul Snyman 659c70b34c Update changelog 2017-03-22 22:08:14 -07:00
Raoul Snyman c3f3b36cd3 Removed some unnecessary comments; Updated changelog 2017-03-22 22:07:16 -07:00
Raoul Snyman 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
Raoul Snyman 07ee83b4fe Pull in refactored merge script 2017-03-22 15:18:13 -07:00
Raoul Snyman cd7b18ef30 Cleanup BibleImportForm tests 2017-03-22 15:17:43 -07:00
Tomas Groth 9ae1af72c7 Minor adjustsments + a test. 2017-03-17 22:12:29 +01:00
Tomas Groth 31ee3999c0 merge lastest trunk 2017-03-15 20:51:10 +01: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
Raoul Snyman c256477919 Formalise the merge script 2017-03-11 22:48:23 -07:00
Raoul Snyman 05a39cb7ea Fix a test that was causing a segfault 2017-03-10 16:46:14 -07:00
Raoul Snyman 3d39e2c77d Ignore a test that is causing a segfault 2017-03-10 16:20:44 -07:00
Raoul Snyman 4bae0fcd69 Fix up two tests 2017-03-10 15:48:59 -07:00
Raoul Snyman 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
raoul@snyman.info 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
raoul@snyman.info 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
Raoul Snyman 094b1f73bc Fix a test 2017-03-01 21:43:45 -07:00
Raoul Snyman 3bc6fc0b77 Fix bug #1666005 and bug #1668994 2017-03-01 21:34:24 -07:00
Raoul Snyman f68336a49f Make the settings dialog as small as possible 
Fixes: https://launchpad.net/bugs/1668669
 2017-03-01 17:07:16 -07:00
Tomas Groth dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01: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
Tomas Groth aac10c5d2c more chord polish... 2017-02-23 22:40:22 +01:00
Tomas Groth 9c299af567 More chord fixes. 2017-02-22 22:01:42 +01:00
Tomas Groth 37e4a05be7 Fix another test. 2017-02-21 06:17:21 +01:00