bcbb523375
pep8
2016-01-09 09:46:20 -08:00
f8d353efcb
Rename test method
2016-01-09 09:43:38 -08:00
Simon Hanna
44cd766885
Remove code that was added by mistake
2016-01-09 18:22:09 +01: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
1e5c187552
PEP8
2016-01-09 16:30:27 +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
second@tgc.dk
45b1ca2870
Disable OpenGL in the maindisplay on windows for now, fixes bug.
...
Fix for easyslide importer and added test.
Made song-importer-list sorted, again.
Small cleanup of videopsalm
Made sundayplus importer work with python3. Added tests.
Fix some tests on windows.
Pep8 fixes
bzr-revno: 2595
Fixes: https://launchpad.net/bugs/1531319
2016-01-09 15:39:48 +01:00
Tomas Groth
e16a1916b7
forgot to remove debug print
2016-01-09 14:53:59 +01:00
Tomas Groth
b0813a5f33
Ops, commited too much
2016-01-09 14:34:16 +01:00
Tomas Groth
e9e845035a
pep8 fixes
2016-01-09 10:09:29 +01:00
Tim Bentley
2be048c51c
Translations
...
bzr-revno: 2594
2016-01-09 06:41:06 +00: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
Simon Hanna
8ccfde6929
Merge trunk in
2016-01-09 01:03:54 +01:00
Samuel Mehrbrodt
b1c9f6937f
Merge branch
2016-01-09 00:08:21 +01:00
Samuel Mehrbrodt
da5790f17f
Merge trunk
2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf
trunk
2016-01-08 22:51:40 +01:00
Tomas Groth
a44d70cb0f
Fix some tests on windows.
2016-01-08 22:44:22 +01:00
Tomas Groth
43e273c4ed
Disable OpenGL in the maindisplay on windows for now.
2016-01-08 22:43:43 +01:00
Tomas Groth
b5270b48a9
Fix for easyslide importer and added test.
2016-01-08 22:42:36 +01:00
Tim Bentley
8a9da23b5c
translations
2016-01-08 21:27:37 +00:00
Tim Bentley
3c23336067
Fix broken remote searchs
...
bzr-revno: 2593
2016-01-08 20:10:06 +00:00
Tomas Groth
211f93a921
Made importer list sorted, again.
2016-01-08 20:53:58 +01:00
Tomas Groth
21b8388069
Small cleanup of videopsalm
2016-01-08 20:52:24 +01:00
Tomas Groth
345f135e98
Made sundayplus importer work with python3. Added tests.
2016-01-08 20:51:03 +01:00
Tim Bentley
7fd37c1033
head
2016-01-08 17:44:47 +00:00
s.mehrbrodt@gmail.com
859288f172
Usability improvements
...
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)
bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340 , https://launchpad.net/bugs/1530354
2016-01-08 17:28:47 +00:00
simon.hanna@serve-me.info
e8e553b663
Modify all forms to remove the help button from their status bar.
...
I don't think I missed a form. The Wizards remain untouched as the help button works there
bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
simon.hanna@serve-me.info
a6ef19683d
CodecForTr was dropped in Qt5
...
The deletion of songs still depended on that.
Just a minor edit to drop the dependency
bzr-revno: 2590
2016-01-08 17:24:48 +00:00
Tim Bentley
fd3a85a68c
head
2016-01-08 17:09:29 +00:00
af3fc71d4a
Fix tests. Sadly Windows tests are still broken.
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-tests (revision 2596)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1215/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1141/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1080/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/920/
bzr-revno: 2589
Fixes: https://launchpad.net/bugs/1531872
2016-01-08 17:09:06 +00:00
Samuel Mehrbrodt
69e1660d6c
PEP8
2016-01-08 15:05:54 +01:00
Simon Hanna
2c5475e8fa
Fix some pep issues in the changed files
2016-01-08 14:47:52 +01:00
4fd53706c6
We still need a db_url. Thanks interface tests!
2016-01-08 00:18:01 +02:00
Samuel Mehrbrodt
ddefceee04
Fix migration for non-sqlite
2016-01-07 23:12:03 +01:00
c4bb673ac0
Remove potentially unnecessary code
2016-01-08 00:00:02 +02:00
Tomas Groth
a61430a59f
Fix the tests on Windows too
2016-01-07 23:57:01 +02:00
7853706479
Apparently BibleServer.com has removed that Bible. Use another one instead.
2016-01-07 23:38:13 +02:00
543d6898d3
Fix up the projector interface tests
2016-01-07 23:36:43 +02:00
Tomas Groth
f2cccb90ae
Fix projector tests
2016-01-07 23:07:55 +02:00
Simon Hanna
d5780b9f78
update functions that were previously methods to drop the '_'
...
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna
7ebbf65a86
Add a test
2016-01-07 13:36:11 +01:00
b1febaa452
Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied.
2016-01-06 22:02:39 +02:00
51eefc84d9
Fix OS X test which wasn't being skipped on non-OS X platforms
2016-01-06 22:00:51 +02:00
