Tomas Groth
9cac014cef
Improving past-end.
2017-10-10 22:12:56 +02:00
Tomas Groth
4ab22f6d6e
merge trunk
2017-10-10 21:34:48 +02:00
Tomas Groth
89a68f9e6b
Fixed a typo and added a SlideShowListener for event handling.
2017-10-10 21:29:03 +02:00
Philip Ridout
46f93a9d1b
head
2017-10-10 20:17:48 +01:00
Philip Ridout
66049f0c96
bible pathlib changes
2017-10-10 20:09:20 +01:00
4b9905a4db
Refactored ScreenList into a new display module, and refactored the directory structure of the tests to make things slightly simpler (just follow the module structure)
...
bzr-revno: 2780
2017-10-10 10:17:03 -07:00
15a4a93c96
Phase 2 complete
2017-10-10 00:08:44 -07:00
4d68382d52
Fix some issues from the mergefest
...
bzr-revno: 2779
2017-10-09 19:40:41 -07:00
19040ebb5d
Refactored 'check_directory_exists' into the more appropriate 'create_paths'; and solve some circular dependency issues
...
bzr-revno: 2778
2017-10-09 19:31:05 -07:00
bc0ade07e0
HEAD
2017-10-09 19:29:56 -07:00
fad0298490
Fix a bug when importing settings
2017-10-09 18:09:45 -07:00
7086c88c7c
Fix a test that was failing (not sure why)
2017-10-09 18:08:09 -07:00
Philip Ridout
cecd2298a7
fixes #1660486 - Dragging item in service manager without changes triggeres 'unsaved'
2017-10-08 21:36:11 +01:00
Philip Ridout
2be17b5c6f
fixes #1532193 - Typos in songusageplugin.py annother fix shamelessly ported from 2.4
2017-10-08 20:41:07 +01:00
Philip Ridout
37da12affd
fixes #1715125 - Missing .osz file extension on save service
2017-10-08 20:29:54 +01:00
Philip Ridout
71ad60d038
fixes #1660478 - Opening recent file does not prompt to save changes
2017-10-08 20:01:09 +01:00
Philip Ridout
98d5f0ec67
fix 1660473, shamlessly ported from 2.4.5
2017-10-08 19:38:56 +01:00
Philip Ridout
779e95b523
Fix for samuel_m issue and bug #1672229
2017-10-08 18:33:03 +01:00
bc2fac7cfd
Missed one thing
2017-10-07 00:08:25 -07:00
b406cfd5a8
Phase 1 complete
2017-10-07 00:05:07 -07:00
26c78b374a
HEAD
2017-10-04 23:28:57 -07:00
dbf63fed26
All the tests passing. Now the big work to get the new stuff properly integrated
2017-10-04 22:10:52 -07:00
Tomas Groth
ea0dd6f7aa
merge trunk
2017-10-04 22:01:29 +02:00
640ebf8c3c
Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken.
2017-10-04 00:44:08 -07:00
f6a91839fc
Remove unused and unnecessary render class
2017-10-03 16:11:06 -07:00
Tim Bentley
df39497cc1
Add option to add a split to a song
...
This will split the verse when added to the service but keep the verse together for editing.
Useful for the 10 line hymn verses which need 2 slides to display.
Fix some iffy spelling
lp:~trb143/openlp/splitter (revision 2738)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2182/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2085/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1972/
[SUCCESS] https://ci.openlp.io/job/Branch ...
bzr-revno: 2777
2017-10-03 17:19:06 +01:00
8ad2f96d90
Pulled Phil's branch, and merged in Tomas' latest changes too
2017-10-02 09:20:38 -07:00
Tim Bentley
b07f2e9f86
head
2017-10-01 21:11:03 +01:00
Phill
aac0152406
Regen resources to remove old qr codes and add new qr code
...
bzr-revno: 2776
2017-10-01 21:03:58 +01:00
Phill
d8ce9d21a5
Removed one qr code from the remotes tab and made the other point to the openlp website mobile downloads so that:
...
* Remote tab is less cluttered
* Future proof updates, these only need to be made on the website, meaning that older versions of openlp will not break
* Offer android users the option to use f-store (rather than automatically being sent to the play store)
--------------------------------
lp:~phill-ridout/openlp/qr (revision 2770)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/ ...
bzr-revno: 2775
2017-10-01 21:03:18 +01:00
Phill
c49b72dd57
Pathlib changes for the song plugin
...
lp:~phill-ridout/openlp/pathlib8 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2230/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2133/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/2015/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1380/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1207/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/337/
[FAILURE] https://ci.o ...
bzr-revno: 2774
2017-10-01 21:02:34 +01:00
Philip Ridout
1d327944c5
regen resource file
2017-10-01 08:45:53 +01:00
Philip Ridout
40edbf3a62
Add new qrcode
2017-10-01 08:21:32 +01:00
Philip Ridout
13bfa1c2f7
HEAD
2017-10-01 07:58:20 +01:00
Philip Ridout
70d9287a80
Prehead commit
2017-10-01 07:57:11 +01:00
Philip Ridout
c5a6fd9e31
Pep fixes
2017-10-01 00:06:30 +01:00
Philip Ridout
76bbc4500a
Pep fixes
2017-09-30 23:51:49 +01:00
Philip Ridout
70e50f4aaa
Pep fixes
2017-09-30 23:45:24 +01:00
Philip Ridout
d8a32d3962
HEAD
2017-09-30 22:47:50 +01:00
Philip Ridout
9bb2935208
Tidy ups
2017-09-30 22:45:54 +01:00
Philip Ridout
ab49b8b8ad
pathlib changes for song plugin
2017-09-30 21:16:30 +01:00
Tim Bentley
dddd5ab4cd
Import export
2017-09-30 15:17:37 +01:00
Tim Bentley
63cdc813b0
Fix the api errors found
...
Remove the remote plugin and move the code to core
Add the update of the web package date back in.
fix up review comments.
lp:~trb143/openlp/webfixes (revision 2785)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2225/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2128/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/2011/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1376/
[SUCCESS] https://ci.openlp.io/job/Branch-04b- ...
bzr-revno: 2773
2017-09-29 21:13:00 +01:00
Tomas Groth
e440b83ca9
Minor appveyor.yml cleanup
2017-09-29 21:57:11 +02:00
Tomas Groth
3c35501ae9
merge trunk
2017-09-29 21:10:31 +02:00
Tomas Groth
ff25d0d59e
merge trunk
2017-09-29 20:59:42 +02:00
Tim Bentley
5203518ccb
head
2017-09-29 19:53:22 +01:00
Tim Bentley
cd1b6715b6
fix merge comments
2017-09-29 19:53:04 +01:00
Tim Bentley
d77f0127e8
head
2017-09-29 19:42:15 +01:00
Tim Bentley
158fdd3e63
spelling
2017-09-29 19:41:55 +01:00
