1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Commit graph

229 commits

Author SHA1 Message Date
Cameron
0e409e2717
Merge branch 'master' into migrate-to-ES6-48 2020-08-02 09:14:01 +01:00
Cameron
49c1b3e159 Addition of defaults 2020-08-02 09:00:25 +01:00
dkanada
cefdde1848
Merge pull request #1681 from jellyfin/book-paging
Add paging in book player with touch events
2020-08-02 16:50:29 +09:00
dkanada
1a9f39caaf
Merge pull request #1709 from jellyfin/unstable
Rename chromecast flavors
2020-07-31 22:18:44 +09:00
dkanada
79a59d17c3 rename chromecast flavors 2020-07-31 22:16:20 +09:00
Cameron
5b91863b49
Merge branch 'master' into migrate-to-ES6-39 2020-07-31 13:57:49 +01:00
MrTimscampi
22a46ecea6 Apply ESLint autofix for no-yoda rule 2020-07-31 12:40:08 +02:00
Dmitry Lyzo
6ef3be136a Add parseInt radix 2020-07-30 23:36:52 +03:00
nyanmisaka
b232117ff5 minor changes 2020-07-31 00:35:23 +08:00
nyanmisaka
bd2fdf4c70 resolve conflicts 2020-07-31 00:30:05 +08:00
Dmitry Lyzo
48886918d3 Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing
Conflicts:
	src/components/subtitlesettings/subtitleappearancehelper.js
	src/plugins/htmlVideoPlayer/plugin.js
2020-07-30 17:57:33 +03:00
Bond-009
e7180e2633
Merge pull request #1091 from cromefire/es6-2
Migrated HtmlVideoPlayer
2020-07-30 15:54:34 +02:00
Nyanmisaka
fe390efbc5
follow the server side changes 2020-07-30 16:49:09 +08:00
Cromefire_
cf6324e462
Fixed link to redirect target 2020-07-30 00:44:33 +02:00
Cromefire_
e9c9f4966c
Fixed type of AudioTrackList 2020-07-30 00:41:11 +02:00
Cromefire_
062ea29ad2
Fixed wrong array typing 2020-07-29 19:51:33 +02:00
Bill Thornton
585667067b Fix fullscreen video in iOS Safari 2020-07-29 09:28:06 -04:00
dkanada
c76f550b91 add paging in book player with touch events 2020-07-29 19:36:44 +09:00
Cameron
66ea2631b5 remove bookplayer .default 2020-07-29 11:24:30 +01:00
nyanmisaka
7849f57f69 allows to use multiple fallback fonts 2020-07-29 03:31:11 +08:00
nyanmisaka
86c87446e3 add options for using fallback fonts 2020-07-29 03:30:46 +08:00
Cromefire_
340522a471
Removed dead code and fixed lint 2020-07-27 22:29:25 +02:00
Cromefire_
ae3b53d728
Apply suggestions from code review
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
2020-07-27 22:07:10 +02:00
Cromefire_
606f1fc94c
Removed more warnings 2020-07-27 19:58:57 +02:00
Cromefire_
e7f8036865
Make lint happy 2020-07-27 19:55:36 +02:00
Cromefire_
7ab3e27a4e
Merge branch 'master' into es6-2
# Conflicts:
#	src/plugins/htmlVideoPlayer/plugin.js
2020-07-27 19:02:10 +02:00
Cromefire_
a98d0ed759
Removed dead code 2020-07-27 18:54:04 +02:00
Cromefire_
28a489a148
Apply suggestions from code review
Co-authored-by: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com>
2020-07-27 18:43:59 +02:00
MrTimscampi
5e1b6acffe Disallow block padding 2020-07-27 08:06:46 +02:00
MrTimscampi
8fb8dacdf1 Migrate shell, serverNotifications to ES6 + remove searchtab 2020-07-26 22:45:00 +02:00
Cromefire_
88043825a1
Fix imports from htmlMediaHelper 2020-07-26 14:18:34 +02:00
MrTimscampi
60ec70b2d8 Fix linting errors 2020-07-26 13:10:32 +02:00
MrTimscampi
5e58951605 Remove mediaManager from htmlVideoPlayer 2020-07-26 12:56:46 +02:00
Dmitry Lyzo
450807ff14 Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing
Conflicts:
	src/components/subtitlesettings/subtitleappearancehelper.js
	src/components/subtitlesettings/subtitlesettings.js
	src/elements/emby-slider/emby-slider.js
2020-07-26 13:35:17 +03:00
MrTimscampi
29759ac884 Kill shaka and fix livetvschedule 2020-07-26 12:32:59 +02:00
MrTimscampi
a09a9e9a3a Remove some more things 2020-07-26 12:32:36 +02:00
MrTimscampi
dfbb7dfc16 Remove dead code 2020-07-26 12:30:50 +02:00
Cameron
249500add3
Merge branch 'master' into es6-2 2020-07-26 10:48:48 +01:00
MrTimscampi
3713091382 Merge remote-tracking branch 'upstream/master' into es6
With conflicts
2020-07-24 10:23:14 +02:00
dkanada
3eada38dd2
Merge branch 'es6' into migrate-to-ES6-33 2020-07-23 11:59:30 +09:00
Cromefire_
a97ed99bce
Converted another concat to template 2020-07-22 22:59:27 +02:00
Cromefire_
2c7c76b413
Added private property and improved usage of template strings 2020-07-22 22:42:26 +02:00
Cromefire_
99758f065e
Apply suggestions from code review
Co-authored-by: Cameron <Influence365@gmail.com>
2020-07-22 21:08:44 +02:00
Cromefire_
1829651565
Fixed hlsjs import 2020-07-22 20:27:36 +02:00
Cromefire_
159a7f55d3
Fixed old function type
Co-authored-by: Cameron <Influence365@gmail.com>
2020-07-22 20:12:32 +02:00
dkanada
e3b1a4017a
Merge pull request #1616 from Camc314/migrate-to-ES6-27
Removal of Require
2020-07-22 23:37:06 +09:00
Cromefire_
394c1195d1
Initialize currentSubtitlesOctopus
Co-authored-by: Cameron <Influence365@gmail.com>
2020-07-21 22:34:08 +02:00
Cromefire_
982a474965
Fix Octopus import
Co-authored-by: Cameron <Influence365@gmail.com>
2020-07-21 22:33:18 +02:00
Cromefire_
5ea3d1cbaa
Fixed lint 2020-07-21 22:22:16 +02:00
Cromefire_
a1b2ed2c4a
Fixed event handling 2020-07-21 19:41:34 +02:00