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

15187 Commits

Author SHA1 Message Date
Raoul Snyman 26c78b374a HEAD 2017-10-04 23:28:57 -07:00
Raoul Snyman dbf63fed26 All the tests passing. Now the big work to get the new stuff properly integrated 2017-10-04 22:10:52 -07:00
Raoul Snyman 640ebf8c3c Added JavaScript tests in; Refactored some stuff, removed some stuff. Lots börken. 2017-10-04 00:44:08 -07:00
Raoul Snyman 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
Raoul Snyman 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 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
Raoul Snyman 7a5381f996 Enable the use of QDarkStyle, if it is installed. This is mainly for those users on Windows and macOS who want a dark theme. 
QDarkStyle is only pip-installable at present, but we can include it in the PyInstaller builds.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/dark-style (revision 2773)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2224/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2127/
[SUCCESS] https://ci.openlp.io/jo...

bzr-revno: 2772
 2017-09-29 19:41:16 +01:00
Philip Ridout 1cfb152395 some WebEngine fixes 2017-09-29 19:06:04 +01:00
Philip Ridout 6780a44496 fixes 2017-09-29 18:31:35 +01:00
Raoul Snyman 11fbad77dc Fix some linting issues 2017-09-29 08:55:39 -07:00
Raoul Snyman 0dcf3de267 Tests! 2017-09-28 20:06:00 -07:00
Raoul Snyman 76bf162383 Fix error with Settings().value() call 2017-09-28 16:50:23 -07:00
Raoul Snyman 77b9fee050 Checkbox is only there is there is a dark style 2017-09-28 16:39:44 -07:00
Raoul Snyman 1b7482243d Centralise style tweaks 2017-09-28 16:28:18 -07:00
Raoul Snyman c2e16cc8e9 HEAD 2017-09-28 10:32:10 -07:00
Raoul Snyman 93fd4053b2 Add dark theme from QDarkStyle. Part 1: Force the theme 2017-09-28 10:31:28 -07:00
Tim Bentley 0c1b1dc2a5 fix tests 2017-09-27 20:21:08 +01:00
Tim Bentley e2fd8beb2a fix tests 2017-09-27 20:16:24 +01:00
Tim Bentley bfc8a5ae8c fix tests 2017-09-27 20:12:22 +01:00
Tim Bentley 71a87f602b fix download date 2017-09-27 19:56:21 +01:00
Tim Bentley 74cdc761d9 end of remote and server migration 2017-09-26 22:18:09 +01:00
Tim Bentley f58d1047db move endpoint 2017-09-26 22:04:39 +01:00
Tim Bentley 9d6bd78a70 head 2017-09-26 21:34:47 +01:00
Tim Bentley 4451b65f04 add files2 2017-09-26 21:34:08 +01:00
Tim Bentley b783783a29 add files 2017-09-26 21:33:58 +01:00
Tomas Groth e16c7899bb small stuff 2017-09-26 22:16:41 +02:00
Tomas Groth 359362126a merge trunk 2017-09-26 20:43:35 +02:00
Phill d94138b349 pathlib changes to the theme code 
lp:~phill-ridout/openlp/pathlib7 (revision 2773)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2214/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2117/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/2003/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1369/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1200/

bzr-revno: 2771
 2017-09-26 20:37:27 +02:00