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

16758 Commits

Author SHA1 Message Date
Raoul Snyman 90aad493b6 Merge branch 'broken_stuff' into 'master' 
Broken stuff

Closes #477

See merge request openlp/openlp!161
 2020-04-02 18:48:27 +00:00
Tim Bentley 3f41c852f2 Fix some race conditions, remove calls to ImageManager, fix a crash in the remote API, fix some more test issues. 2020-04-02 18:48:27 +00:00
Raoul Snyman d451f21c0b Merge branch 'workingon-api' into 'master' 
Added basic theme API

See merge request openlp/openlp!128
 2020-04-01 18:26:59 +00:00
Fernando Quant 5e4559cdb3 Added basic theme API 2020-04-01 18:26:57 +00:00
Raoul Snyman b85d6e0ded Merge branch 'tests_interfaces_1' into 'master' 
Tests interfaces 1

See merge request openlp/openlp!158
 2020-03-19 20:04:28 +00:00
Tim Bentley cbc9f8c8e2 Tests interfaces 1 2020-03-19 20:04:28 +00:00
Tim Bentley 86d730f1c7 Merge branch 'upgrade-web-remote' into 'master' 
Refactor web remote deployment, plus other fixes and enhancements

See merge request openlp/openlp!153
 2020-03-19 16:44:14 +00:00
Raoul Snyman 73507884fb
Refactor web remote deployment, plus other fixes and enhancements 
- Refactor deployment away from the web server thread
- Refactor the web remote settings tab
- Provide a way for threads to show an error message to the user
- Fix an issue where multiple zeroconf services were being run instead of a single instance on multiple addresses
- Refactored the DownloadProcess dialog
- Fix the tests
 2020-03-17 19:31:18 -07:00
Tim Bentley 4a667c77fc Merge branch 'api-return-on-empty-search' into 'master' 
Always return a list when searching in the API

Closes web-remote#1

See merge request openlp/openlp!156
 2020-03-14 17:00:09 +00:00
Tim Bentley 73afe240dc Merge branch 'tests_plugin_5' into 'master' 
Tests plugin 5

See merge request openlp/openlp!157
 2020-03-11 21:53:41 +00:00
Tim Bentley fa9a3c6f92 Tests plugin 5 2020-03-11 21:53:41 +00:00
Daniel 48901cecfc always return a list when searching in the api 
It is not a error when no search results are returned, it is to be expected. The api should return a empty list to show that there were no results (status code 200 OK) rather than a 400 (BAD REQUEST).
 2020-03-11 13:22:37 +13:00
Tim Bentley 980c68488a Merge branch 'fix-qcollatorsortkey-err' into 'master' 
Fix error when adding songs from services.

See merge request openlp/openlp!155
 2020-03-10 21:40:39 +00:00
Tomas Groth 982b4470c7 Fix error when adding songs from services. 2020-03-10 21:40:39 +00:00
Tim Bentley da4a3570f3 Merge branch 'tests_plugin_4' into 'master' 
Tests plugin 4

See merge request openlp/openlp!154
 2020-03-10 16:59:26 +00:00
Tim Bentley 4ce197ecc2 Tests plugin 4 2020-03-10 16:59:25 +00:00
Raoul Snyman 050e49465e Merge branch 'fix_song_editor_crash' into 'master' 
Fix song editor crash

Closes #459

See merge request openlp/openlp!150
 2020-03-09 04:05:21 +00:00
Daniel 122596c6fb Don't call a non existent function (create_slides on a service item) 
There is a private fn prefixed with a "_", but it's not needed as it is run when required (hence the reason it's private). If the slide vars did need to be regenerated, `render_text_items` is the way to do it.
 2020-03-09 04:05:20 +00:00
Tim Bentley ef3ecfeaa9 Merge branch 'network-stream' into 'master' 
Add support for network streams.

See merge request openlp/openlp!151
 2020-03-08 22:05:10 +00:00
Tomas Groth 127ee05ac3 Add support for network streams. 2020-03-08 22:05:09 +00:00
Tim Bentley 80a2cfc2d2 Merge branch 'tests_plugin_3' into 'master' 
Tests plugin 3 - and Fix #272

Closes #272

See merge request openlp/openlp!152
 2020-03-08 21:45:42 +00:00
Tim Bentley d43811f38d Tests plugin 3 - and Fix #272 2020-03-08 21:45:42 +00:00
Tim Bentley b51829d4d6 Merge branch 'between-item-transitions' into 'master' 
Transitions between items

Closes #191

See merge request openlp/openlp!121
 2020-03-05 20:35:25 +00:00
Daniel d5892b6258 Don't reload images on start (they are already loaded) 
Someone should check if the start param in this function is even needed now, looks like an artifact from the old renderer
 2020-03-05 20:35:25 +00:00
Tim Bentley 54ed4d5c0e Merge branch 'tests_plugin_2' into 'master' 
Tests plugin 2

See merge request openlp/openlp!149
 2020-03-05 20:34:09 +00:00
Tim Bentley 7d532778bd Tests plugin 2 2020-03-05 20:34:08 +00:00
Raoul Snyman 79950b6a85 Merge branch 'tests_plugin_1' into 'master' 
Migrate Functional Plugin Tests Part 1

See merge request openlp/openlp!146
 2020-03-04 06:06:47 +00:00
Tim Bentley 8fa698d510 More fixes for broken tests 
Skip one which never worked but relied on data leakage!
 2020-03-04 06:06:47 +00:00
Tim Bentley 519be1ee47 Merge branch 'revealjs392' into 'master' 
Update Reveal.js to 3.9.2

See merge request openlp/openlp!148
 2020-03-03 21:26:16 +00:00
Tomas Groth 5e6c20486a Update Reveal.js to 3.9.2 2020-03-03 21:26:16 +00:00
Tim Bentley d4e6bf7a42 Merge branch 'fix_vertical_positioning' into 'master' 
fix vertical positioning on text slides

Closes #422

See merge request openlp/openlp!147
 2020-03-03 17:06:29 +00:00
Daniel 11a68d36ad fix vertical positioning on text slides 2020-03-03 20:25:36 +13:00
Raoul Snyman 79734f9f76 Merge branch 'broken_stuff' into 'master' 
Two broken functions found in testing.

See merge request openlp/openlp!145
 2020-02-28 07:10:14 +00:00
Tim 7f7ac0f20d
Two broken functions found in testing. 2020-02-27 21:48:45 +00:00
Tim Bentley 4ed0d0586c Merge branch 'skip-non-mac-test-on-mac' into 'master' 
Skip a non-macOS test which is failing on macOS

See merge request openlp/openlp!144
 2020-02-24 17:09:23 +00:00
Raoul Snyman 71874302d0
Skip a non-macOS test which is failing on macOS 2020-02-23 23:15:56 -07:00
Tim Bentley 2a8fc22886 Merge branch 'appv_3' into 'master' 
Fix appvoyer yet another go.

See merge request openlp/openlp!143
 2020-02-23 13:48:45 +00:00
Tim 7fc55e3e40
Fix appvoyer yet another go. 2020-02-22 21:16:40 +00:00
Raoul Snyman fbcf47c86a Merge branch 'appv1' into 'master' 
Appv - fix the next issue.

See merge request openlp/openlp!142
 2020-02-21 07:18:26 +00:00
Tim Bentley f9181665b8 Fix appvoyer tests - we hope 
Migrate UI to pytest and fix up all tests.
 2020-02-21 07:18:26 +00:00
Tim Bentley 744de67daf Merge branch 'appv' into 'master' 
Resolve AppVeyor breakage

See merge request openlp/openlp!141
 2020-02-19 06:23:17 +00:00
Tim Bentley 5d821b1772 Fix appvoyer tests - we hope 
Migrate UI to pytest and fix up all tests.
 2020-02-19 06:23:17 +00:00
Tim Bentley 2405ed7e4f Merge branch 'tests_4' into 'master' 
Tests 4

See merge request openlp/openlp!140
 2020-02-18 08:08:39 +00:00
Tim Bentley 922b65cf18 Fix appvoyer tests - we hope 
Migrate UI to pytest and fix up all tests.
 2020-02-18 08:08:39 +00:00
Tim Bentley 62b89ecec4 Merge branch 'tests_3' into 'master' 
Tests 3 - Finish UI and Widgets

See merge request openlp/openlp!139
 2020-02-15 21:04:17 +00:00
Tim Bentley 86af416233 Tests 3 - Finish UI and Widgets 2020-02-15 21:04:17 +00:00
Tomas Groth ec680b93b6 Merge branch 'pytest-qt-appveyor' into 'master' 
Added pytest-qt to appveyor installation.

See merge request openlp/openlp!138
 2020-02-15 21:02:40 +00:00
Tim Bentley a0eeef724f Merge branch 'tests_2' into 'master' 
Migrate tests to pytest

See merge request openlp/openlp!137
 2020-02-14 20:31:08 +00:00
Tomas Groth cb517ca299 Added pytest-qt to appveyor installation. 2020-02-14 20:18:26 +00:00
Tim dae7880604
Migrate lib part 1 2020-02-13 21:04:15 +00:00