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

16694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim
a544aa11ff
Migrate display 2020-02-13 20:57:51 +00:00
Tim
2eb385c774
Migrate core and common 2020-02-13 20:50:39 +00:00
Tim Bentley
3bda907d4d Merge branch 'tests_1' into 'master' 
Tests part 1

See merge request openlp/openlp!136
 2020-02-12 20:28:33 +00:00
Tim Bentley
170c37d441 Revert "Migrate Media and add Pytest-qt" 
This reverts commit 3dcac055be.
 2020-02-12 20:28:33 +00:00
Raoul Snyman
0a22c7f77a Merge branch 'CCLI-fixes' into 'master' 
CCLI fixes

Closes #245

See merge request openlp/openlp!132
 2020-02-10 21:29:31 +00:00
Daniel
b455077ff8 Allow searching past the first page of songs 
Previously the first ten songs were just repeated
 2020-02-10 21:29:30 +00:00
Tim Bentley
873e0c414d Merge branch 'settings_end_1' into 'master' 
Settings end

See merge request openlp/openlp!134
 2020-02-09 20:24:05 +00:00
Tim Bentley
3dcac055be Migrate Media and add Pytest-qt 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2020-02-09 20:24:05 +00:00
Tim Bentley
15d1198ae9 Merge branch 'fix-settings-crash' into 'master' 
Fix common settings crash

See merge request openlp/openlp!133
 2020-02-09 08:01:15 +00:00
Daniel
0b3ee4e1ba Fix common settings crash 2020-02-09 08:01:15 +00:00
Tim Bentley
b71ccfd09e Merge branch 'settings_core_4' into 'master' 
Settings core 4

See merge request openlp/openlp!131
 2020-02-07 19:53:52 +00:00
Tim Bentley
7cdc2a68de Migrate Projectors 
Signed-off-by: Tim <tim.bentley@gmail.com>
 2020-02-07 19:53:52 +00:00
Tomas Groth
11b24c8e1f Merge branch 'multiple-streams' into 'master' 
Add support for multiple streams.

See merge request openlp/openlp!116
 2020-02-04 20:35:35 +00:00
Tomas Groth
d9b65d8873 Made the stream selector a lightweight version of the VLC capture device selector. Still some work to do. 2020-02-04 20:35:35 +00:00