Commit Graph

12 Commits

Author SHA1 Message Date
Ethan Pippin f02c52f20a lint 2022-01-10 15:51:24 -07:00
Ethan Pippin 057beca0ff localize 2022-01-10 15:48:29 -07:00
Ethan Pippin eb71e8b8d0 fix for updated swiftformat 2022-01-10 13:59:10 -07:00
Ethan Pippin e12da2cf07 format merge 2022-01-10 13:34:03 -07:00
Ethan Pippin 071d07d5ff Merge branch 'main' into swiftformat-third-times-the-charm 2022-01-10 13:31:04 -07:00
Ethan Pippin 4298062ca3 swiftformat 2022-01-10 12:28:03 -07:00
koen 63e02f46bf Merge branch 'main' into subtitle-sizes 2022-01-10 17:47:32 +01:00
koen 213259fde5 Merge branch 'main' into subtitle-sizes
# Conflicts:
#	Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift
2022-01-09 13:23:22 +01:00
koen 438ce63c5c Provides subtitle size options 2022-01-09 13:13:21 +01:00
Ethan Pippin d77f59d048 remove hls stream 2022-01-08 18:06:03 -07:00
Ethan Pippin 158edb3b5f support external subtitles 2022-01-07 15:37:19 -07:00
Ethan Pippin 73a3f2fcdc rename jellyfinplayer to swiftfin 2022-01-07 11:05:54 -07:00