lgladsden/jf-roku
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
2,633 Commits 6 Branches 0 Tags 28 MiB
ef568b2ba8
Commit Graph

939 Commits

Author SHA1 Message Date
1hitsong
f10f6e749d
Merge pull request #976 from sevenrats/update-node-version-in-ci 
Update ci ubuntu version and node version
 2023-01-26 17:58:58 -05:00
1hitsong
890dc5d1e2 Fix formatting 2023-01-26 17:45:20 -05:00
1hitsong
835135892a
Merge branch 'unstable' into FasterHomeScreen 2023-01-26 17:42:00 -05:00
1hitsong
a0979b930c
Merge pull request #955 from 1hitsong/SpeedUpHomeViewLoad 
Make Home View load faster
 2023-01-26 17:35:38 -05:00
sevenrats
58f43f5353 lowercase mod to satisfy bsfmt 2023-01-25 12:44:38 -05:00
1hitsong
d498c38a94
Merge branch 'unstable' into revert605 2023-01-25 08:35:30 -05:00
candry7731
9d61199347 Move "Load Latest" to OnLibLoaded Sub 2023-01-18 20:14:23 -06:00
candry7731
82c1561a37 Updated "OnNow" home row to default to channel images if program images are not availible 2023-01-18 19:52:11 -06:00
sevenrats
53958fa8cc unbreak grid view setting 2023-01-15 20:08:19 -05:00
sevenrats
7c72385ba4 improve settings menu 2023-01-15 19:49:29 -05:00
1hitsong
8a4759ee49 Make Home View load faster 2023-01-09 19:38:50 -05:00
1hitsong
aee0eda4ab
Merge branch 'unstable' into MovieGridTitleOptions 2023-01-07 18:16:46 -05:00
Jimi
3c850dcab0
Merge pull request #939 from jimdogx/JF-501-Crash-when-watching-inprogress-recording 
Don't crash when viewing in progress recording.
 2023-01-05 06:36:59 -07:00
1hitsong
77d813f58d Fix issue Hover Title First Load 2023-01-05 06:36:46 -05:00
1hitsong
855ca0877d Add Recording to LoadItemsTask 2023-01-04 13:54:22 -05:00
1hitsong
d9a2b22b08
Merge branch 'unstable' into musicGridView 2023-01-02 10:18:24 -05:00
1hitsong
1abdc4a600
Merge branch 'unstable' into musicGridView 2023-01-02 10:06:51 -05:00
1hitsong
45ec59e43c Check m.view is valid 2023-01-02 09:48:45 -05:00
1hitsong
4efb87b646
Merge branch 'unstable' into FixTVGenres 2023-01-02 09:39:32 -05:00
Jimi
6b370f2b23 Fix formatting (my bad) 2023-01-02 06:14:39 -07:00
Desmond Chai
faf9f17896
Update components/tvshows/TVListDetails.brs 
Co-authored-by: Jimi <jimi@thedodgefamily.com>
 2023-01-01 16:50:19 -08:00
1hitsong
8db4527feb Fix Title display issue if Item Count setting enabled 2023-01-01 19:04:18 -05:00
Desmond Chai
18f57cbc60 disableCommunityRating for TV shows (fix spacing) 2023-01-01 06:24:07 -08:00
1hitsong
ad66045c60
Merge pull request #921 from ApexArray/fix-crash-on-invalid-optionsAvailable 
Fix crash when pressing options button during initial video buffering
 2022-12-31 08:41:42 -05:00
1hitsong
cbf49f43f4 Add new text to translations 2022-12-30 22:45:58 -05:00
1hitsong
fb090d6575 Create Music Grid View 2022-12-30 21:59:19 -05:00
1hitsong
30b5b64c51 Create new Movie Grid Title option 2022-12-30 13:09:27 -05:00
1hitsong
29d5f42203
Merge pull request #911 from 1hitsong/MovieGridView 
Create Movie Grid View and new default setting
 2022-12-30 12:16:26 -05:00
1hitsong
7af27a5488 Update genre view for TV series 2022-12-30 11:59:56 -05:00
Alex Wardle
554bcd1ae9 increase checkmark font size to 35 2022-12-29 15:56:18 -07:00
1hitsong
4f0ddb0037
Merge branch 'unstable' into WhatsNewPopup 2022-12-29 12:30:56 -05:00
1hitsong
083622ec22 Hide any loaded movie data if filter returns no results 2022-12-29 08:43:58 -05:00
1hitsong
8e17e87d81 Add resumable filter to movies 2022-12-29 08:43:58 -05:00
1hitsong
0c51357a71
Merge pull request #893 from 1hitsong/UnwatchedFilter 
Filter Movies & Series by Played/Unplayed status
 2022-12-29 08:36:23 -05:00
1hitsong
ee3b389c7a
Merge pull request #882 from 1hitsong/ShowUnwatchedCount 
Show unwatched count
 2022-12-29 08:30:03 -05:00
1hitsong
e7466d2e4a
Merge pull request #877 from 1hitsong/fixEpisodeFocus 
Fix TV Episode focus issues
 2022-12-29 08:25:07 -05:00
1hitsong
e045d378de
Merge pull request #881 from 1hitsong/musicGenreView 
Update music library view & add genre view
 2022-12-29 08:24:26 -05:00
1hitsong
c14ca81847
Merge pull request #862 from 1hitsong/GlobalPlayQueue 
Create Queue Manager and use for Music
 2022-12-29 08:23:56 -05:00
Alex Wardle
dc33ccd6dd improve checkmark alignment 2022-12-28 15:35:50 -07:00
Alex Wardle
e4e942fa74 slight resizing 2022-12-28 15:31:17 -07:00
Alex Wardle
50f20685aa use rectangle and label for playback indicator 2022-12-28 15:26:50 -07:00
Alex Wardle
7bf4d8e1ac fix progress bar pixel calculation 2022-12-28 13:25:10 -07:00
Alex Wardle
d39ec5c31a add client-side progressBar and playedIndicator 
render these client side to ensure they fit in custom image size
 2022-12-28 13:13:03 -07:00
Alex Wardle
4afb42535a return focus to option menu if visible 2022-12-28 09:52:31 -07:00
1hitsong
7250c6a253 Revert "Merge pull request #605 from jimdogx/fixes/flickering-items" 
This reverts commit 9b47ed6685.
 2022-12-26 15:42:50 -05:00
Alex Wardle
6b109273e7 set poster loadDisplayMode="scaleToZoom" 
prevents distoring images in episode listing
 2022-12-24 13:23:29 -07:00
1hitsong
aa7571f943 Fix loop functionality 2022-12-23 16:48:59 -05:00
Alex Wardle
d360defb02 convert <> invalid to isValid() 2022-12-23 10:37:44 -07:00
Alex Wardle
07bc24b51a add validation check for group.optionsAvailable 
fixes crash when pressing back during initial video buffering
 2022-12-23 10:23:52 -07:00
1hitsong
ca2a56bca3
Merge pull request #914 from ApexArray/pause-vid-on-ok-button-press 
pause video when ok button is pressed
 2022-12-22 07:53:18 -05:00
Alex Wardle
2dfc5370af fix behavior when trickplay is visible or seeking 2022-12-21 15:05:06 -07:00
1hitsong
a4962648f3 Create What's New popup 
Demo: 
https://social.linux.pizza/@tgpo/109553679336510552
 2022-12-21 17:01:44 -05:00
Alex Wardle
f1b433195d fix trickplay check and remove debug code 2022-12-20 19:38:26 -07:00
Alex Wardle
9277bf0556 pause video when ok button is pressed 2022-12-20 16:55:25 -07:00
1hitsong
41b1c978f9 Fix resume popup showing twice 2022-12-20 17:39:06 -05:00
1hitsong
3d1ec33379 Fix return to top animation 2022-12-20 07:46:15 -05:00
1hitsong
277f2cb137 Prevent ratings from disappearing 2022-12-20 07:22:59 -05:00
1hitsong
946a33e8b3 Fix TV List Crash 
Fixes #910
 2022-12-19 21:21:09 -05:00
1hitsong
545c91ef58 Create default movie view setting 2022-12-19 21:03:35 -05:00
1hitsong
303014d9c3 Create Movie Grid View 2022-12-19 19:33:02 -05:00
1hitsong
d3d94d0e4c Add placeholders & move title down 2022-12-14 20:55:03 -05:00
1hitsong
54975e1841 Restrict unplayed count on home view to Series only 2022-12-14 20:09:59 -05:00
1hitsong
31e6f01c08 Add unplayed count to homepage 2022-12-14 20:09:59 -05:00
1hitsong
b97c98c7b5 Add unplayed count to tv show list 2022-12-14 20:08:52 -05:00
1hitsong
53b53661aa Add unplayed count to season poster 2022-12-14 20:08:52 -05:00
1hitsong
077b96df9c Add unplayed count to row of seasons 2022-12-14 20:08:52 -05:00
1hitsong
32e5582a02 Add unplayed count to Show Poster 2022-12-14 20:08:52 -05:00
1hitsong
5fdc97a98b Filter by Played/Unplayed status 2022-12-14 18:55:46 -05:00
1hitsong
233d981c05 Create music genre view 2022-12-10 14:05:55 -05:00
1hitsong
e183ddc894 Draw percent complete bar instead of using image api 
Fixes #691
 2022-12-09 21:53:00 -05:00
1hitsong
4f4b1d5748 Fix TV Episode focus issues 
1. Pressing back on resume dialog on episode list
2. Choosing resume and pressing back from video playback
 2022-12-09 20:26:32 -05:00
1hitsong
49668dd5ae Fix Next Episode button if trickplay never used 2022-12-09 10:30:00 -05:00
1hitsong
1989314363
Merge pull request #826 from candry7731/Voice-Filter-on-Live-TV-Fix 
Fix Filter reload Issues with Live TV
 2022-12-08 09:15:02 -05:00
1hitsong
f757490f02
Merge pull request #857 from jimdogx/feature/jf-830-movie-additonal-parts 
Additional Movie Parts
 2022-12-08 09:13:55 -05:00
Jimi
66a2fd4186
Merge branch 'unstable' into Voice-Filter-on-Live-TV-Fix 2022-12-08 06:59:42 -07:00
Jimi
3673a03113 Wide thumbnail for additonal parts. 2022-12-08 06:53:50 -07:00
candry7731
04a73c25f4 Add officialRating back to MovieDetails.brs 2022-12-07 12:47:39 -06:00
candry7731
1d9b5d6275 Remove "replay" code in schedule.brs 2022-12-07 12:43:37 -06:00
candry7731
26a12256b4 change multiLabel feild back to label 2022-12-06 21:08:02 -06:00
candry7731
de05d2f515 Update all lables to hide if no data 2022-12-06 21:07:15 -06:00
candry7731
3755ade7e3 Removed "Aired" from MovieDetails 2022-12-06 15:25:22 -06:00
candry7731
f2498d93da
Merge branch 'unstable' into Add-Episode-Aired-Date-to-details 2022-12-06 14:44:02 -06:00
candry7731
5c5acd226e
Merge branch 'unstable' into Voice-Filter-on-Live-TV-Fix 2022-12-06 14:42:42 -06:00
candry7731
3cbbd81ec4 fixed LCase() 2022-12-06 14:16:33 -06:00
candry7731
54c13158d6 Add LCase() 2022-12-06 14:14:12 -06:00
candry7731
12ffbacfaf remove debug code 2022-12-06 13:59:05 -06:00
candry7731
9ac94ddb4a Added tr("all") to channels view 2022-12-06 13:56:21 -06:00
1hitsong
24a910710f Adjust air date spacing 2022-12-05 19:33:08 -05:00
Jimi
74a11512ab Move Additonal Parts to the top 2022-12-03 06:25:27 -07:00
Jimi
4312e9ac7e Shuffle is really Random 2022-12-02 06:26:47 -07:00
Jimi
46d894560a
Merge branch 'unstable' into feature/jf-photo-slideshow 2022-12-02 06:17:15 -07:00
1hitsong
b59768852c Move all queue function to manager 2022-12-01 19:22:00 -05:00
1hitsong
3857b286ec Don't call MetaData task if data is passed 2022-12-01 16:47:27 -05:00
1hitsong
945383d5fd Create global play queue 2022-11-30 20:36:28 -05:00
candry7731
6999538361
fix search results navigation per Neil Suggestion (#852) 2022-11-29 19:14:32 +00:00
1hitsong
a714eae7cd
Merge pull request #784 from candry7731/Next-UP-Button 
Add "Next Episode" button in the last 30 seconds of an episode
 2022-11-22 08:53:39 -05:00
1hitsong
4c48a5b10e
Merge pull request #856 from jimdogx/fixes/jf-video-details-wrong 
Fixes/jf video details wrong
 2022-11-21 19:33:37 -05:00
1hitsong
f63c0a4995 Code cleanup 2022-11-21 16:48:24 -05:00
candry7731
feace10345 Move Task.control to fire once video state=playing 2022-11-21 15:02:25 -06:00
1hitsong
a0c0a7c3ac Check if next episode exists when content changes 2022-11-21 09:25:34 -05:00
candry7731
a762e65a75 added api to check is next episode is valid 2022-11-20 23:43:20 -06:00
1hitsong
119b14634e Code cleanup 2022-11-20 20:18:23 -05:00
Jimi
f11db7bdb7 Working, needs more testing. 2022-11-20 09:29:10 -07:00
1hitsong
10bb0115dd Auto stash before merge of "feature/jf-photo-slideshow" and "jimdogx/feature/jf-photo-slideshow" 2022-11-19 15:39:45 -05:00
Jimi
3e57cb2095 Merge branch 'unstable' into feature/jf-photo-slideshow 2022-11-19 13:18:48 -07:00
Jimi
e54a4cba41 Add shuffle 2022-11-19 13:17:35 -07:00
Jimi
9cbfbe711d Fix to copy/paste 2022-11-19 08:32:33 -07:00
Jimi
7d1d4dbcb4 Make sure video codec details are actually a video codec. 2022-11-19 08:20:29 -07:00
Jimi
6225b77f7c Slideshow 2022-11-19 07:29:57 -07:00
Jimi
78ab9e9233 Support left, right navigation while viewing photos 2022-11-18 22:57:40 -07:00
1hitsong
8b1c8c36a7
Merge pull request #847 from 1hitsong/handleShortRuntime 
Handle short runtime for TV Episodes
 2022-11-18 10:00:46 -05:00
1hitsong
b9103be7c3 Remove unused code 2022-11-17 21:30:33 -05:00
1hitsong
d17e988971 Add comments 2022-11-17 21:23:09 -05:00
1hitsong
beab170142 Only check contenttype once on content change 2022-11-17 21:17:31 -05:00
candry7731
0ce5d2fd67 Add contenttype=4 to else statment 2022-11-16 20:53:20 -06:00
candry7731
96a7cb7c35 Fix dialog focus issues. 2022-11-15 15:14:05 -06:00
candry7731
9d361ab47f Added aired date to moviesDetials 2022-11-12 23:06:32 -06:00
candry7731
d93a89a5de remove debug code 2022-11-12 22:58:34 -06:00
candry7731
ef8d5dc914 Fix nextup button when trickbar has focus 2022-11-12 22:55:03 -06:00
1hitsong
e1f2ed7fc3
Merge pull request #821 from 1hitsong/ui-refresh/movie-library-list 
Update Movie Library View
 2022-11-11 09:45:10 -05:00
1hitsong
61a531e990 Hide movie title on other views 2022-11-11 08:38:07 -05:00
candry7731
cc8a27358a Hide nextepisode button when rewind after visible 2022-11-10 22:54:30 -06:00
candry7731
f0960e8e9c Hide rating layoutgroup if no data 2022-11-10 22:35:34 -06:00
1hitsong
add49b4ca3 Handle short runtimes 2022-11-10 23:04:03 -05:00
candry7731
2e30c2e4e1 Remove Debug and add check function 2022-11-09 13:44:12 -06:00
candry7731
92d70482c2 Adde Aired Date to episode details 2022-11-08 21:29:38 -06:00
candry7731
efac0afe83 Add missing code 2022-11-06 22:35:02 -06:00
1hitsong
3bf61208f1 Remove debug code 2022-11-06 13:06:09 -05:00
1hitsong
1549ea11b6 Add 20 random favorites to home view 2022-11-06 07:07:39 -05:00
1hitsong
71c672732d Update Movie Library View 2022-11-03 20:55:20 -04:00
candry7731
cfdc660f87 fix validation and format 2022-11-02 20:18:16 -05:00
Neil Burrows
987e1d6259
Update overhand time logic (#817) 2022-10-29 12:27:01 +01:00
candry7731
4131c6616e loading spinner 
Added Loading spinner to movies detail screens
 2022-10-26 23:04:44 -05:00
candry7731
fdfb0e0fc8 Fix Filter reload Issues with Live TV 
Add the ability for the user to say "all" to show all channels after the guide has been filtered by a voice command.

In the channel view the reload button will clear the filter and show all channels
 2022-10-25 22:35:49 -05:00
1hitsong
4cac6d4467
Merge pull request #823 from 1hitsong/fix-cinema-mode 
Fix Cinema Mode Intro bug
 2022-10-22 09:24:54 -04:00
1hitsong
7f94039d71 Fix function name & comment 2022-10-21 12:57:11 -04:00
1hitsong
4ce9f18152 Fix Cinema Mode Intro bug 2022-10-21 12:09:28 -04:00
1hitsong
afc00ca7e7 Stop load channel task on back press 2022-10-19 20:31:38 -04:00
1hitsong
8908f11bf2
Merge pull request #792 from candry7731/Fix-Search 
Fix Episode titles when search
 2022-10-11 20:10:26 -04:00
candry7731
a35f476bfd
Merge branch 'unstable' into Next-UP-Button 2022-10-11 09:57:02 -05:00
candry7731
c6ad4752c5 format 2022-10-09 20:25:32 -05:00
candry7731
dfe9b84ae6 add now palying fix 2022-10-09 20:22:06 -05:00
1hitsong
c069830f6d
Merge pull request #813 from 1hitsong/remove-optional-chaining 
Remove optional chaining
 2022-10-07 11:38:06 -04:00
1hitsong
b5293c5773
Merge pull request #811 from 1hitsong/music-appears-on 
Add appears on music artist section
 2022-10-07 08:05:52 -04:00
1hitsong
e7fa28df0d Remove optional chaining 2022-10-06 14:34:24 -04:00
massi
d965598913
Fix out of sync home page (#789) 2022-10-06 17:01:36 +01:00
1hitsong
27721eac8d
Merge pull request #796 from candry7731/Season-Row 
Fix Season Row Size
 2022-10-06 11:48:37 -04:00
1hitsong
f257a3195a Adjust album view 2022-10-05 09:09:55 -04:00
1hitsong
5f4fb2239f Add appears on artist section 2022-10-02 06:24:31 -04:00
candry7731
6bc139deb6 changes 2022-09-26 23:30:23 -05:00
1hitsong
60f977bd95
Merge pull request #797 from 1hitsong/slider-controller 
Update Artist view to use slider controller
 2022-09-25 06:24:46 -04:00
1hitsong
1832dfd0d6
Merge pull request #781 from jimdogx/jf-video-stats 
Jf video stats
 2022-09-23 08:20:02 -04:00
candry7731
3a60c81257 Moved "Cast & Crew" down 10px 2022-09-22 19:35:06 -05:00
candry7731
aa95165405
Add Music Video Support (#799) 2022-09-21 20:36:38 +01:00
1hitsong
dbcc1ea45e Hide overhang when not on 1st section 2022-09-19 19:46:29 -04:00
1hitsong
e2976b8ed2 Use slider controller 2022-09-19 18:59:33 -04:00
candry7731
d6859ad8a4 Added Padding to extras row to align 2022-09-17 14:45:09 -05:00
candry7731
fa7ca26e58 Update for Autoscaling guidelines 2022-09-17 14:14:46 -05:00
candry7731
96288d470a Fix Season Row Size 2022-09-17 13:50:47 -05:00
candry7731
fdb02a3b81 format now playing.brs 2022-09-15 23:09:48 -05:00
candry7731
221ab29535 hide Resume dialog on search screen 2022-09-15 23:08:01 -05:00
candry7731
ec57374cb4 Fix Episode titles when search 
Hide Episode titles when a new search is processed
 2022-09-14 23:03:13 -05:00
1hitsong
d3bfaaaec9 Remove IntroSkipper support 2022-09-14 19:34:29 -04:00
candry7731
fcb00564df
Auto Reload LiveTv when feed Errors (#669) 2022-09-12 10:00:55 +01:00
Any-Fuel-5635
4ae67ed144
QOL and wording changes to Server Select and Login Screens (#777) 2022-09-08 20:19:48 +01:00
candry7731
febcfe5e40
Update JFVideo.brs 2022-09-06 23:06:10 -05:00
candry7731
edd39732ba
Update JFVideo.xml 2022-09-06 23:04:46 -05:00
Jimi
e02afad161 Merge branch 'unstable' into jf-video-stats 2022-09-05 22:42:35 -06:00
Jimi
9d0a25df77 Streaming information 2022-09-05 22:38:37 -06:00
candry7731
621e53e647
Redesign Search page with voice search (#593) 2022-09-05 07:50:13 +01:00
1hitsong
3c187f8f64
Support next up time limit (#767) 2022-09-04 12:22:08 +01:00
1hitsong
25fbe66ed2
Report music playback (#768) 2022-09-04 08:39:44 +01:00
1hitsong
524e3f0ec7
Play local trailers (#761) 2022-09-03 08:31:15 +01:00
1hitsong
14b3edf65a
Add Music Artist section navigation (#760) 2022-09-02 09:12:40 +01:00
Jimi
2397c4f3f7
Merge pull request #759 from jimdogx/jf-crash-when-missing-premieredate 
Avoid crash if missing Premiere Date
 2022-08-27 14:57:18 -06:00
Jimi
dc7cfe7f39
Merge pull request #758 from alanazar/patch-2 
Update TVShowDetails.brs
 2022-08-27 13:32:46 -06:00
Jimi
6c469c675f Avoid crash if missing Premiere Date 2022-08-27 13:22:59 -06:00
alanazar
3666112de4
Update MovieDetails.brs 2022-08-27 19:34:27 +04:00
alanazar
ba178e580a
Update TVShowDetails.brs 2022-08-27 19:31:15 +04:00
alanazar
4a9b2b88c2
Update components/movies/MovieDetails.brs 
Co-authored-by: 1hitsong <3330318+1hitsong@users.noreply.github.com>
 2022-08-27 19:28:31 +04:00
alanazar
7bf1a8cd05
Update MovieDetails.brs 
Rating on Movies are showing as 3 decimal points instead of 1.
I used the same format to do the calculation to 1 decimal point as in the TV shows
 2022-08-27 19:07:45 +04:00
1hitsong
1893121fdf
Add support for Intro Skipper plugin (#696) 2022-08-27 07:27:45 +01:00
Jimi
1e712614e6 Code comments 2022-08-24 21:42:09 -06:00
Jimi
fb071641ae Fix to crash 2022-08-24 21:36:52 -06:00
debmint
12517707d8
Correctly set focus after exiting a screen created from Extras group (#719) 
Co-authored-by: 1hitsong <3330318+1hitsong@users.noreply.github.com>
 2022-08-20 09:54:36 +01:00
Neil Burrows
f6679cc4f1
Check Clock node is found before trying to hide (#736) 2022-08-12 07:48:14 +01:00
Jimi
61af15a6c5
Merge pull request #704 from 1hitsong/artist-design-update 
Artist view UI and UX improvement
 2022-08-06 18:31:34 -06:00
1hitsong
2b52256b77 Resolve Conflicts 2022-08-05 20:06:48 -04:00
1hitsong
2e76997947 Merge remote-tracking branch 'origin/artist-design-update' into artist-design-update 2022-08-05 19:59:29 -04:00
1hitsong
af4a9aabeb Update Artist view 2022-08-05 19:58:05 -04:00
1hitsong
78a9e4e1c4 Improve Object Names 2022-08-05 19:57:49 -04:00
Jimi
3717fb249d
Merge pull request #697 from 1hitsong/hide-header-clock 
Add user setting: Hide Clock
 2022-08-05 17:46:00 -06:00
1hitsong
b728c4b224 Add user setting: Hide Clock 
#273
 2022-07-24 11:59:07 -04:00
Jimi
9f5138a9f5 spinner while loading 2022-07-24 11:58:13 -04:00
1hitsong
ebbb4deeb9 Add song track number and length to album view 2022-07-24 11:58:13 -04:00
1hitsong
1b490f599f Update Artist view 2022-07-24 11:57:07 -04:00
1hitsong
e4954caec1 Improve Object Names 2022-07-24 11:57:07 -04:00
Charles Ewert
d3c7373a9d don't extend ContentNode #rokubug 2022-07-22 22:41:47 -04:00
Charles Ewert
251cebb16d
Merge branch 'master' into transcoding-fix 2022-07-21 21:58:12 -04:00
Charles Ewert
3b78005a4d formatting 2022-07-21 20:31:39 -04:00