Tomas Groth
798093adfe
trunk
2017-05-11 22:24:20 +02:00
Tomas Groth
3287027315
Unbreak the songimport tests...
2017-05-11 22:01:43 +02:00
Tomas Groth
ad94e7c19f
Added some more comments for songbeamer import and added support for author type.
2017-05-11 21:53:47 +02:00
d74c9c0c81
Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now.
...
Windows tests are failing due to file sharing (we've had this issue before), unrelated to my changes.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/refactor-mock (revision 2734)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1992/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1902/
[SUCCESS] https://...
bzr-revno: 2733
2017-05-10 18:50:33 +01:00
9b70fe44cf
HEAD
2017-05-08 12:10:46 -07:00
335fed689d
Last few tests with bad imports
2017-05-08 12:04:14 -07:00
aeabd498a0
Remove the now defunct version detection and imports
2017-05-08 11:33:11 -07:00
Tomas Groth
e00e8117a9
Added detection of songbeamer tags, if they are manually inserted or not.
2017-05-07 22:26:03 +02:00
Phill
9eeeb243ea
Fix the QFormLayout in BibleImportForm
...
Fix one of the tests that was skipped
lp:~phill-ridout/openlp/test_fixes (revision 2732)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1973/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1883/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1824/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1206/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1074/
[SUCCESS] https://ci.openlp.io/job/Branch-04c ...
bzr-revno: 2732
2017-05-06 20:42:24 +01:00
Philip Ridout
1100cd5a5b
Fix segfault with QFormLayout in BibleImportForm\nAlso fix up a failing test
2017-05-06 10:22:34 +01:00
Tomas Groth
d60ea23de6
Try to fix songbeamer chord imports
2017-05-05 20:48:01 +02:00
Tomas Groth
7f64106acb
Fix a traceback when serviceitem type isn't set
2017-05-05 20:47:19 +02:00
Tomas Groth
c17d6c7866
Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.
...
bzr-revno: 2731
2017-05-05 17:27:20 +01:00
Tomas Groth
0fc912bd8f
Updated jenkins script to match new setup.
2017-05-04 23:53:50 +02:00
Tomas Groth
b98468e4dd
More fixes for appveyor scripts.
2017-05-03 22:16:52 +02:00
Tomas Groth
a57a12441b
Fix and improvements to appveyor build script
2017-05-03 20:40:30 +02:00
Tomas Groth
a39240badf
Replace songbeamers flatnote representationwith the actual flatnote sign.
2017-05-01 21:16:39 +02:00
Tomas Groth
aa224b9568
Try to workaround windows problems.
2017-04-25 21:52:20 +02:00
Tomas Groth
bdfac76483
improve db cleanup
2017-04-25 21:36:37 +02:00
Tomas Groth
e9e7285b8c
remove session instead of close to release file.
2017-04-25 21:18:03 +02:00
Tomas Groth
a06b41d7ac
merge trunk
2017-04-25 20:54:18 +02:00
Tomas Groth
3b46b8416d
Only convert bracket tags to chords on songs when chords are enabled.
2017-04-25 20:46:50 +02:00
Tomas Groth
55f63a0a0f
Only convert bracket tags to chords for songs.
2017-04-25 16:41:35 +02:00
baa09a7dd6
Mock comes with Python as of 3.3, and I don't think there is anyone using lower than 3.3, so let's use Python's mock directly now
2017-04-23 22:17:55 -07: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
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
Tomas Groth
97c33fde46
Fix test.
2017-03-23 20:36:09 +01: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
Tomas Groth
3bf9c53523
Updated appveyor script to new setup.
2017-03-22 22:35:55 +01: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
