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
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
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
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
63ae19e8db
Merge branch 'bug320' into 'master'
...
Deregister screen-updates to the theme widget when it closes. Fixes #320 .
Closes #320
See merge request openlp/openlp!130
2020-02-03 23:03:24 +00:00
Tomas Groth
442dc7d0d2
Deregister screen-updates to the theme widget when it closes. Fixes #320 .
2020-02-03 23:03:24 +00:00
Tim Bentley
4486b4b5a2
Merge branch 'settings_core_3' into 'master'
...
Settings core 3
See merge request openlp/openlp!129
2020-02-01 21:12:07 +00:00
Tim Bentley
020661059f
Migrate Display
...
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-02-01 21:12:07 +00:00
d08762426c
Merge branch 'settings_core_2' into 'master'
...
Settings core 2
See merge request openlp/openlp!127
2020-01-29 06:50:09 +00:00
Tim Bentley
45e38c4959
Migrate API to Settings
...
Fix missing / incorrect copyright
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-29 06:50:09 +00:00
89504256f0
Merge branch 'implement-new-api' into 'master'
...
Implement new api
See merge request openlp/openlp!31
2020-01-27 22:57:58 +00:00
Simon Hanna
ef2f798f6f
Update remote API to use Flask, and be more RESTful
2020-01-27 22:57:58 +00:00
Tim Bentley
52d811331c
Merge branch 'settings_plugins_3' into 'master'
...
Settings plugins 3 - More Plugin Migrations
See merge request openlp/openlp!125
2020-01-26 17:12:45 +00:00
Tim Bentley
fa97550301
Migrate more plugins for settings
...
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-26 17:12:45 +00:00
cc1a19efea
Merge branch 'settings_plugins_2' into 'master'
...
Settings plugins 2
See merge request openlp/openlp!124
2020-01-21 16:59:46 +00:00
Tim Bentley
86f85081b6
Migrate plugins from Settings() Alert and Bibles
...
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-21 16:59:46 +00:00
Tim Bentley
2422208e6b
Merge branch 'import-fixes' into 'master'
...
Import fixes
See merge request openlp/openlp!123
2020-01-18 21:45:47 +00:00
Tomas Groth
1ebc6737d7
Made the bibel and song import more robust.
...
Tested the importers by loading a text file, a png file and an xml file.
2020-01-18 21:45:47 +00:00
Tomas Groth
9dd8f51773
Merge branch 'settings_plugins_1' into 'master'
...
Migrate Plugins and media item
See merge request openlp/openlp!122
2020-01-18 21:00:13 +00:00
Tim Bentley
debbced7e3
Update the plugin classes and remove the uneeded code
...
Signed-off-by: Tim <tim.bentley@gmail.com>
2020-01-18 21:00:13 +00:00
Tomas Groth
3a2a3cba9a
Merge branch 'fade-transition-speed' into 'master'
...
Theme fade transition speed
Closes #331
See merge request openlp/openlp!114
2020-01-18 14:07:40 +00:00
Tim Bentley
74cb7218f9
Merge branch 'fix-chords-customs-splits' into 'master'
...
Properly detect chords, support >5 optional splits
Closes #278
See merge request openlp/openlp!120
2020-01-16 17:26:13 +00:00
b85f1db06f
Properly detect chords, support >5 optional splits
...
- Properly detect only chords in square brackets
- Properly detect Bibles so that custom slides are rendered as text items
- Make more than 5 optional splits work (fixes #278 )
2020-01-15 22:05:26 -07:00
Tim Bentley
781ff2c7ea
Merge branch 'media_1' into 'master'
...
Text Over Video.
See merge request openlp/openlp!119
2020-01-12 21:03:40 +00:00