Commit Graph

113 Commits

Author SHA1 Message Date
a54ff79ca1 Merge branch 'update-dependencies' into 'master'
Update dependencies

See merge request openlp/web-remote!47
2022-12-21 16:27:47 +00:00
Daniel Martin
cec351f2fa Update dependencies 2022-12-21 16:27:47 +00:00
cde10571a7 Merge branch 'chord-stage-view-adjustments' into 'master'
Remaking the chordpro routines and the chord + stage viewer

See merge request openlp/web-remote!46
2022-12-17 07:09:43 +00:00
Mateus Meyer Jiacomelli
9bd4d6aec6 Remaking the chordpro routines and the chord + stage viewer 2022-12-17 07:09:43 +00:00
Tim Bentley
b319373541 Merge branch 'fix-stage-sticky-navbar' into 'master'
Fixing the new sticky navbar overlapping Stage, Chord and Main views

See merge request openlp/web-remote!45
2022-12-15 17:30:46 +00:00
Mateus Meyer Jiacomelli
26d39760db Fixing the new sticky navbar overlapping Stage, Chord and Main views 2022-12-15 17:30:46 +00:00
Tim Bentley
b9d3f3caab Merge branch 'issue-26-22' into 'master'
Fixes for issues 26 and 22

Closes #22 and #26

See merge request openlp/web-remote!44
2022-12-01 14:22:48 +00:00
2ad25d163a Fixes for issues 26 and 22 2022-12-01 14:22:48 +00:00
a83d129630 Merge branch 'websocket-dropout-fix' into 'master'
Websocket reconnection routines

See merge request openlp/web-remote!43
2022-11-14 16:17:51 +00:00
Mateus Meyer Jiacomelli
278aca6277 adding websocket reconnection routines + UI indicator; upgrading material-icons to use more recent package 2022-11-14 16:17:51 +00:00
Tim Bentley
75d0007239 Merge branch 'transpose-web-api' into 'master'
First step in using the new transpose web api endpoint.

See merge request openlp/web-remote!42
2022-10-19 11:51:04 +00:00
Tomas Groth
90d1da5090 First step in using the new transpose web api endpoint. 2022-10-19 11:51:03 +00:00
Tim Bentley
a46d117649 Merge branch 'inject-version-number' into 'master'
Maintain the version number in assets/version.js

See merge request openlp/web-remote!40
2022-02-10 22:16:37 +00:00
845b270e06 Maintain the version number in assets/version.js 2022-02-10 22:16:36 +00:00
Tim Bentley
62dfb688e7 Merge branch 'component-refactor' into 'master'
Service + Slide Component refactor

See merge request openlp/web-remote!39
2021-09-06 07:11:20 +00:00
Mateus Meyer Jiacomelli
ff03ca521f Service + Slide Component refactor 2021-09-06 07:11:19 +00:00
b915f4004c Merge branch 'icon-fix' into 'master'
Fix theme icon in side-bar and footer

See merge request openlp/web-remote!38
2021-06-29 03:22:24 +00:00
Exkywor
35fb9149f0
Fix theme icon in side-bar and footer 2021-06-28 20:47:53 -06:00
Tim Bentley
7af4f684eb Merge branch 'issue-19-local-resources' into 'master'
Add Material icons and Roboto font for local resources (closes #19)

Closes #19

See merge request openlp/web-remote!37
2021-06-28 06:17:33 +00:00
ba1fbe8fc5 Merge branch 'master' into 'master'
Added thumbnails to Stage and Slides views

See merge request openlp/web-remote!36
2021-06-28 04:52:51 +00:00
Joe Schneider
03c76cd3ce Added thumbnails to Stage and Slides views 2021-06-28 04:52:51 +00:00
c5948a4111 Add Material icons and Roboto font for local resources (closes #19) 2021-06-27 21:44:50 -07:00
96eed0785a Merge branch 'yorkshire-pudding-master-patch-10045' into 'master'
fixes #16 Text selectable in Web Remote Control v0.9.5 2.9.2

Closes #16

See merge request openlp/web-remote!35
2021-03-31 00:36:07 +00:00
Martin Price
9286f039af Update request to reflect suggestions by @ninjakiwi:
Added class for no-select in styles.  Added reference to class in slides.component.html and service.component.html as I believe you would never need to select the text in the remote controller here
2021-03-31 00:36:07 +00:00
Tim Bentley
cdf03beb45 Merge branch 'fix_openlp_service_scope_for_stages' into 'master'
Fix typescript build error

See merge request openlp/web-remote!34
2021-03-02 07:45:19 +00:00
Daniel
36ca78ecc7 Set openlpService to public in stage js to make typescript happy 2021-03-02 19:50:29 +13:00
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
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
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
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
7a09dd85d6
Fix an issue where a method was not expecting a parameter 2020-12-22 21:49:31 -07:00
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
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
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
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
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
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
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