jellyfish-web/src/elements
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
..
emby-button Resolve conflicts 2020-07-24 12:25:07 +02:00
emby-checkbox Resolve conflicts 2020-07-24 12:25:07 +02:00
emby-collapse Disallow block padding 2020-07-27 08:06:46 +02:00
emby-input Disallow block padding 2020-07-27 08:06:46 +02:00
emby-itemrefreshindicator Disallow block padding 2020-07-27 08:06:46 +02:00
emby-itemscontainer Disallow block padding 2020-07-27 08:06:46 +02:00
emby-playstatebutton Disallow block padding 2020-07-27 08:06:46 +02:00
emby-programcell remove var 2020-07-10 18:09:02 +01:00
emby-progressbar migrate emby-progressbar, itemrefreshindicator, progressring and slider to ES6 modules 2020-07-11 10:36:04 +01:00
emby-progressring Disallow block padding 2020-07-27 08:06:46 +02:00
emby-radio Disallow block padding 2020-07-27 08:06:46 +02:00
emby-ratingbutton Disallow block padding 2020-07-27 08:06:46 +02:00
emby-scrollbuttons Remove dead code 2020-07-26 12:30:50 +02:00
emby-scroller Resolve conflicts 2020-07-24 12:25:07 +02:00
emby-select Disallow block padding 2020-07-27 08:06:46 +02:00
emby-slider Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing 2020-07-30 17:57:33 +03:00
emby-tabs Disallow block padding 2020-07-27 08:06:46 +02:00
emby-textarea Disallow block padding 2020-07-27 08:06:46 +02:00
emby-toggle Disallow block padding 2020-07-27 08:06:46 +02:00