Commit Graph

237 Commits

Author SHA1 Message Date
Tim Bentley 145329f65f Merge branch 'fix_24_hour_setting' into 'master'
Make stage views use the 12 hour time setting

Closes #14

See merge request openlp/web-remote!33
2021-02-22 17:30:53 +00:00
Daniel ed24a1e1f3 lint fix 2021-02-19 19:16:41 +13:00
Daniel 86c602b41b Make stage views use the 12 hour time setting 2021-02-19 19:09:28 +13:00
Raoul Snyman e6366ce12e Merge branch 'update_for_search_option_api' into 'master'
Fix api calls for new search option api

See merge request openlp/web-remote!32
2021-02-02 02:27:51 +00:00
Daniel Martin 2482cbb1b3 Fix api calls for new search option api 2021-02-02 02:27:51 +00:00
Raoul Snyman 2812e383e6 Merge branch 'theme-changes' into 'master'
Remove theme name and column controllers. Make themes into a fixed sized and the column responsive.

See merge request openlp/web-remote!31
2021-01-30 06:06:10 +00:00
Fernando Quant 16886d6e30 Remove theme name and column controllers. Make themes into a fixed sized and the column responsive. 2021-01-30 06:06:09 +00:00
Tomas Groth 341405e715 Merge branch 'update_angular' into 'master'
Update angular

Closes #11

See merge request openlp/web-remote!30
2021-01-03 18:05:10 +00:00
Daniel Martin 0b55941314 Update angular 2021-01-03 18:05:10 +00:00
Raoul Snyman d9997b93d1 Merge branch 'fix-build' into 'master'
Fix an issue where a method was not expecting a parameter

See merge request openlp/web-remote!29
2020-12-23 05:12:13 +00:00
Raoul Snyman 7a09dd85d6
Fix an issue where a method was not expecting a parameter 2020-12-22 21:49:31 -07:00
Raoul Snyman d8a81bd9ad Merge branch 'release-0.9.5' into 'master'
Release 0.9.5

See merge request openlp/web-remote!28
2020-12-23 04:08:26 +00:00
Raoul Snyman 066116398b
Release 0.9.5 2020-12-22 20:55:19 -07:00
Tomas Groth 29f9ba4366 Merge branch 'change_api' into 'master'
Change api signature

See merge request openlp/web-remote!26
2020-10-19 07:19:38 +00:00
Raoul Snyman 2f0cdae201 Merge branch 'search-selected-plugin' into 'master'
Store last selected search plugin and retrieve it after loading.

See merge request openlp/web-remote!27
2020-10-17 05:30:37 +00:00
Exkywor 2d45c33dc7 Store last selected search plugin and retrieve it after loading. 2020-10-14 12:43:34 -06:00
Tim b22df76bd4
Change signature 2020-10-12 12:03:26 +01:00
Raoul Snyman 5169db2d0d Merge branch 'themes-thumbnails' into 'master'
Themes thumbnails

See merge request openlp/web-remote!25
2020-08-27 05:07:14 +00:00
Fernando Quant b33cf7e781 Themes thumbnails 2020-08-27 05:07:14 +00:00
Raoul Snyman fae84f278b Merge branch 'bibleversionapi' into 'master'
Bible search options

See merge request openlp/web-remote!23
2020-08-27 04:55:12 +00:00
Fernando Quant e1de5c329e Added retrieval and set of search options for the Bibles plugin, allowing to change the Bible version from the remote 2020-08-27 04:55:11 +00:00
Tim Bentley 5df672eda0 Merge branch 'add-notes-to-stage-view' into 'master'
Add notes to stage view, fix some issues

See merge request openlp/web-remote!24
2020-07-25 20:57:41 +00:00
Raoul Snyman 2d10b7a363
Add notes to stage, fix CORS issue
- Use a ServiceItem object rather than just slides to transfer more information at one time
- Add notes to stage view
- Fix CORS issue
2020-07-22 16:41:10 -07:00
Raoul Snyman 29041b7f1e Merge branch 'fix_chord_view' into 'master'
Fix chord view

Closes #10

See merge request openlp/web-remote!22
2020-06-22 00:35:06 +00:00
Daniel 4cff5fbc47 Fix chord view 2020-06-22 00:35:06 +00:00
Tim Bentley 7ad0d39871 Merge branch 'websockets' into 'master'
Update the State Management code

See merge request openlp/web-remote!21
2020-06-20 07:25:21 +00:00
Tim Bentley 2d8ee13fc7 Update the State Management code 2020-06-20 07:25:20 +00:00
Raoul Snyman 24c74ab3c9 Merge branch 'valid' into 'master'
Block requesting invalid Service items from UI.

See merge request openlp/web-remote!20
2020-05-20 17:04:53 +00:00
Tim Bentley ad75ca76ee Block requesting invalid Service items from UI. 2020-05-20 17:04:52 +00:00
Tim Bentley 22a1a1cab3 Merge branch 'issue-8' into 'master'
Fix up some issues in the themes component

Closes #8

See merge request openlp/web-remote!18
2020-05-16 16:45:20 +00:00
Raoul Snyman ac4a99d75e
Improve the UI and fix some bugs
- Get the current theme from OpenLP
- Set the service item by UUID
- Actually set the theme and theme level
- Clean up various bits of code
- Switch to a tab bar at the bottom of the screen
- Save the "fast switching" state to localStorage for persistance
- Clean up some API bits to match OpenLP
2020-05-15 23:03:28 -07:00
Tomas Groth 83747dc1cf Merge branch 'text' into 'master'
Minor text change

See merge request openlp/web-remote!19
2020-05-13 18:15:02 +00:00
Tim 9f665256d6
fix text 2020-05-10 17:43:46 +01:00
Tim Bentley 4e3567864a Merge branch 'fix_main_view_scale' into 'master'
Fix main view scale and positioning

Closes #9

See merge request openlp/web-remote!17
2020-04-19 08:41:23 +00:00
Daniel 4f694dd71a Fix main view scale and positioning 2020-04-17 16:27:07 +12:00
Tim Bentley 06a03e4aa3 Merge branch 'release-0.9.2' into 'master'
Release version 0.9.2

See merge request openlp/web-remote!16
2020-04-09 08:31:42 +00:00
Raoul Snyman d06d24f18c Merge branch 'fix-slide-cut-off' into 'master'
Resolve: "Cut off bottom of slides"

Closes #3

See merge request openlp/web-remote!13
2020-04-09 06:58:21 +00:00
Daniel fee63eaec1 Resolve: "Cut off bottom of slides" 2020-04-09 06:58:21 +00:00
Raoul Snyman ea64e274d7
Release version 0.9.2 2020-04-08 23:51:54 -07:00
Raoul Snyman 92dae6b050 Merge branch 'fixes_for_main' into 'master'
Make live use correct websocket

See merge request openlp/web-remote!14
2020-04-09 06:49:56 +00:00
Tim Bentley cf6da25539 Make live use correct websocket 2020-04-09 06:49:56 +00:00
Tim Bentley 8de783b87f Merge branch 'remove-hash' into 'master'
Remove the hash from the URLs

See merge request openlp/web-remote!15
2020-04-08 06:38:54 +00:00
Raoul Snyman da7d78d2f9
Remove the hash from the URLs. I'm not sure why it was added. 2020-04-07 21:22:31 -07:00
Tim Bentley 7214b892ce Merge branch '2-all-search-categories-search-songs' into 'master'
Resolve "All search categories search songs"

Closes #2

See merge request openlp/web-remote!12
2020-04-04 10:43:37 +00:00
Daniel 8fb4d16742 Allow searching other plugins besides songs 2020-03-11 00:40:48 +00:00
Tim Bentley ce9d62af14 Merge branch 'update-docs' into 'master'
Documentation and versioning

See merge request openlp/web-remote!11
2020-02-27 17:13:28 +00:00
Raoul Snyman 7d62bf122f
Documentation and versioning
- Refactor and add documentation
- Pull the version number into the UI
- No need to do a yarn install before deployment in GitLab CI
- Make CI generate a version json file
2020-02-27 00:34:52 -07:00
Raoul Snyman 1a7bed1519 Merge branch 'deploy-only-tags' into 'master'
Fix the CI deployment job to only deploy on tags

See merge request openlp/web-remote!10
2020-01-31 06:38:08 +00:00
Raoul Snyman 3adf0e8051 Fix the CI deployment job to only deploy on tags 2020-01-31 06:38:08 +00:00
Raoul Snyman a9e62b49d7 Merge branch 'workingon-themes' into 'master'
Workingon themes

See merge request openlp/web-remote!9
2020-01-29 21:33:02 +00:00