Simon Hanna
4d7ceba301
Merge with trunk
2016-01-10 17:01:43 +01:00
Simon Hanna
e172e2aeb2
Revert Changes
2016-01-10 17:00:05 +01:00
0e8dc032da
Release 2.3.2
...
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
simon.hanna@serve-me.info
764eebcda6
Fix SongImport
...
Ignore Case for versetags when importing Songbeamer files
The issue with importing songs was because the SongFormat list was reordered, but the ordering wasn't passed through to get_format_list()
This error should not happen again, added a testcase just to be sure
bzr-revno: 2601
2016-01-10 07:23:31 +00:00
Simon Hanna
0f1d6718bd
Add tests for ignored case
2016-01-10 01:34:53 +01:00
Simon Hanna
9525453679
Ignore case when matching verse tags during SongBeamerImport
2016-01-10 01:22:31 +01:00
Simon Hanna
70e1f3926b
Add test for fix
2016-01-10 01:18:27 +01:00
Simon Hanna
076cc57d39
Fix Song import
2016-01-10 01:17:58 +01:00
Simon Hanna
faff2b7da4
Undo changes to instance variables
2016-01-09 23:35:56 +01:00
Tim Bentley
51be6b1848
Head
2016-01-09 20:07:40 +00: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
Tim Bentley
c4af2f8708
Head
2016-01-09 19:45:28 +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
Tim Bentley
b4eb79c442
Head
2016-01-09 19:41: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
285ad89725
Remove the media manager stylesheet for now.
...
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/remove_stylesheet (revision 2597)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1228/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1153/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1092/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/930/
Stopping after failure
bzr-revno: 2597
2016-01-09 19:33:38 +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
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
