Luke Pulverenti 7e639dbf67 Merge branch 'dev' ...

Conflicts:
	MediaBrowser.Controller/Entities/BaseItem.cs
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
	SharedVersion.cs

2016-01-11 21:55:52 -05:00

..

aboutpage.js

update sync process

2015-09-24 13:08:10 -04:00

actionsheet.js

update action sheet

2016-01-06 14:28:18 -05:00

addpluginpage.js

update web components

2015-12-23 12:46:01 -05:00

advancedconfigurationpage.js

merge from dev

2015-12-14 10:43:03 -05:00

alphapicker.js

update web components

2015-12-23 12:46:01 -05:00

appservices.js

merge from dev

2015-12-14 10:43:03 -05:00

appsettings.js

update chromecast bitrate setting

2016-01-06 14:28:13 -05:00

autoorganizelog.js

merge from dev

2015-12-14 10:43:03 -05:00

autoorganizetv.js

merge from dev

2015-12-14 10:43:03 -05:00

backdrops.js

update web components

2015-12-23 12:46:01 -05:00

channelitems.js

merge from dev

2015-12-14 10:43:03 -05:00

channels.js

merge from dev

2015-12-14 10:43:03 -05:00

channelsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

channelslatest.js

merge from dev

2015-12-14 10:43:03 -05:00

chromecast.js

update chromecast loading

2016-01-09 12:58:37 -05:00

cinemamodeconfiguration.js

merge from dev

2015-12-14 10:43:03 -05:00

connectlogin.js

update connect login

2015-12-14 12:10:42 -05:00

dashboardgeneral.js

merge from dev

2015-12-14 10:43:03 -05:00

dashboardhosting.js

merge from dev

2015-12-14 10:43:03 -05:00

dashboardpage.js

update web components

2015-12-23 12:46:01 -05:00

device.js

merge from dev

2015-12-14 10:43:03 -05:00

devices.js

merge from dev

2015-12-14 10:43:03 -05:00

devicesupload.js

merge from dev

2015-12-14 10:43:03 -05:00

dlnaprofile.js

merge from dev

2015-12-14 10:43:03 -05:00

dlnaprofiles.js

merge from dev

2015-12-14 10:43:03 -05:00

dlnaserversettings.js

merge from dev

2015-12-14 10:43:03 -05:00

dlnasettings.js

merge from dev

2015-12-14 10:43:03 -05:00

edititemmetadata.js

update web components

2015-12-23 12:46:01 -05:00

editorsidebar.js

merge from dev

2015-12-14 10:43:03 -05:00

encodingsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

episodes.js

update web components

2015-12-23 12:46:01 -05:00

extensions.js

merge from dev

2015-12-14 10:43:03 -05:00

externalplayer.js

update web components

2015-12-23 12:46:01 -05:00

favorites.js

update music buttons

2015-12-29 21:33:52 -05:00

forgotpassword.js

merge from dev

2015-12-14 10:43:03 -05:00

forgotpasswordpin.js

merge from dev

2015-12-14 10:43:03 -05:00

gamegenrepage.js

merge from dev

2015-12-14 10:43:03 -05:00

gamespage.js

merge from dev

2015-12-14 10:43:03 -05:00

gamesrecommendedpage.js

merge from dev

2015-12-14 10:43:03 -05:00

gamestudiospage.js

merge from dev

2015-12-14 10:43:03 -05:00

gamesystemspage.js

merge from dev

2015-12-14 10:43:03 -05:00

globalize.js

update web components

2015-12-23 12:46:01 -05:00

homenextup.js

merge from dev

2015-12-14 10:43:03 -05:00

homeupcoming.js

merge from dev

2015-12-14 10:43:03 -05:00

htmlmediarenderer.js

update web components

2015-12-23 12:46:01 -05:00

indexpage.js

update quality options

2015-12-30 12:02:11 -05:00

itembynamedetailpage.js

merge from dev

2015-12-14 10:43:03 -05:00

itemdetailpage.js

schedule recordings with a dialog

2015-12-15 13:24:41 -05:00

itemlistpage.js

merge from dev

2015-12-14 10:43:03 -05:00

kids.js

merge from dev

2015-12-14 10:43:03 -05:00

librarybrowser.js

update version

2016-01-02 18:54:15 -05:00

librarylist.js

update quality options

2015-12-30 12:02:11 -05:00

librarymenu.js

update promises

2015-12-30 17:12:47 -05:00

librarypathmapping.js

update path substitution page

2016-01-06 14:27:29 -05:00

librarysettings.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvchannel.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvchannels.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvcomponents.js

Fix issue where shows without icons would use the last icon that was displayed

2015-12-30 14:33:01 -05:00

livetvguide.js

make tv guide standalone component

2015-10-08 15:12:53 -04:00

livetvguideprovider.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvitems.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvrecordinglist.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvrecordings.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvseriestimer.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvseriestimers.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvstatus.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvsuggested.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvtimer.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvtimers.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvtunerprovider-hdhomerun.js

merge from dev

2015-12-14 10:43:03 -05:00

livetvtunerprovider-m3u.js

merge from dev

2015-12-14 10:43:03 -05:00

localsync.js

merge from dev

2015-12-14 10:43:03 -05:00

loginpage.js

merge from dev

2015-12-14 10:43:03 -05:00

logpage.js

update web components

2015-12-23 12:46:01 -05:00

mediacontroller.js

update promises

2015-12-30 17:12:47 -05:00

medialibrarypage.js

merge from dev

2015-12-14 10:43:03 -05:00

mediaplayer-video.js

update promises

2015-12-30 17:12:47 -05:00

mediaplayer.js

update h264 detection

2016-01-06 14:26:36 -05:00

metadataadvanced.js

merge from dev

2015-12-14 10:43:03 -05:00

metadataconfigurationpage.js

merge from dev

2015-12-14 10:43:03 -05:00

metadataimagespage.js

merge from dev

2015-12-14 10:43:03 -05:00

metadatanfo.js

resolve nfo page error

2015-12-30 13:49:16 -05:00

metadatasubtitles.js

merge from dev

2015-12-14 10:43:03 -05:00

moviecollections.js

merge from dev

2015-12-14 10:43:03 -05:00

moviegenres.js

merge from dev

2015-12-14 10:43:03 -05:00

movies.js

update web components

2015-12-23 12:46:01 -05:00

moviesrecommended.js

update web components

2015-12-23 12:46:01 -05:00

moviestudios.js

merge from dev

2015-12-14 10:43:03 -05:00

movietrailers.js

merge from dev

2015-12-14 10:43:03 -05:00

musicalbumartists.js

merge from dev

2015-12-14 10:43:03 -05:00

musicalbums.js

merge from dev

2015-12-14 10:43:03 -05:00

musicartists.js

merge from dev

2015-12-14 10:43:03 -05:00

musicfolders.js

merge from dev

2015-12-14 10:43:03 -05:00

musicgenres.js

update web components

2015-12-23 12:46:01 -05:00

musicrecommended.js

update music buttons

2015-12-29 21:33:52 -05:00

mypreferencescommon.js

merge from dev

2015-12-14 10:43:03 -05:00

mypreferencesdisplay.js

update components

2016-01-06 15:16:16 -05:00

mypreferenceshome.js

update components

2016-01-06 15:16:16 -05:00

mypreferenceslanguages.js

update components

2016-01-06 15:16:16 -05:00

myprofile.js

update web components

2015-12-23 12:46:01 -05:00

mysync.js

fix sync status display

2015-10-02 02:14:04 -04:00

mysyncsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

notificationlist.js

update sync process

2015-09-24 13:08:10 -04:00

notifications.js

update web components

2015-12-23 12:46:01 -05:00

notificationsetting.js

merge from dev

2015-12-14 10:43:03 -05:00

notificationsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

nowplayingbar.js

update animation

2015-12-27 13:47:48 -05:00

nowplayingpage.js

update web components

2015-12-23 12:46:01 -05:00

photos.js

merge from dev

2015-12-14 10:43:03 -05:00

playbackconfiguration.js

merge from dev

2015-12-14 10:43:03 -05:00

playlistedit.js

merge from dev

2015-12-14 10:43:03 -05:00

playlistmanager.js

rework playlist editor

2015-10-14 10:47:38 -04:00

playlists.js

merge from dev

2015-12-14 10:43:03 -05:00

plugincatalogpage.js

merge from dev

2015-12-14 10:43:03 -05:00

pluginspage.js

merge from dev

2015-12-14 10:43:03 -05:00

queryfilters.js

merge from dev

2015-12-14 10:43:03 -05:00

ratingdialog.js

update web components

2015-12-23 12:46:01 -05:00

registrationservices.js

update promises

2015-12-30 17:12:47 -05:00

remotecontrol.js

update promises

2015-12-30 17:12:47 -05:00

reports.js

add a new endpoint param IsFavorite and use it for reports

2016-01-12 13:22:52 +11:00

scheduledtaskpage.js

update web components

2015-12-23 12:46:01 -05:00

scheduledtaskspage.js

update web components

2015-12-23 12:46:01 -05:00

search.js

add play button to search results

2015-12-30 17:13:01 -05:00

searchmenu.js

merge from dev

2015-12-14 10:43:03 -05:00

searchpage.js

merge from dev

2015-12-14 10:43:03 -05:00

secondaryitems.js

fix song sorting

2016-01-07 12:28:12 -05:00

sections.js

update promises

2015-12-30 17:12:47 -05:00

selectserver.js

merge from dev

2015-12-14 10:43:03 -05:00

shared.js

merge from dev

2015-12-14 10:43:03 -05:00

sharingmanager.js

update web components

2015-12-23 12:46:01 -05:00

site.js

update chromecast loading

2016-01-09 12:58:37 -05:00

slideshow.js

merge from dev

2015-12-14 10:43:03 -05:00

songs.js

update web components

2015-12-23 12:46:01 -05:00

streamingsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

supporterkeypage.js

better caching of remote data

2016-01-02 18:09:53 -05:00

sync.js

merge from dev

2015-12-14 10:43:03 -05:00

syncactivity.js

update web components

2015-12-23 12:46:01 -05:00

syncjob.js

update web components

2015-12-23 12:46:01 -05:00

syncsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

taskbutton.js

update web components

2015-12-23 12:46:01 -05:00

thememediaplayer.js

merge from dev

2015-12-14 10:43:03 -05:00

tvgenres.js

merge from dev

2015-12-14 10:43:03 -05:00

tvlatest.js

merge from dev

2015-12-14 10:43:03 -05:00

tvrecommended.js

update web components

2015-12-23 12:46:01 -05:00

tvshows.js

update web components

2015-12-23 12:46:01 -05:00

tvstudios.js

merge from dev

2015-12-14 10:43:03 -05:00

tvupcoming.js

merge from dev

2015-12-14 10:43:03 -05:00

useredit.js

update emby connect error message

2015-12-30 17:13:22 -05:00

userlibraryaccess.js

merge from dev

2015-12-14 10:43:03 -05:00

usernew.js

merge from dev

2015-12-14 10:43:03 -05:00

userparentalcontrol.js

merge from dev

2015-12-14 10:43:03 -05:00

userpassword.js

merge from dev

2015-12-14 10:43:03 -05:00

userprofilespage.js

merge from dev

2015-12-14 10:43:03 -05:00

wizardagreement.js

update tabs

2015-09-01 10:01:59 -04:00

wizardfinishpage.js

merge from dev

2015-12-14 10:43:03 -05:00

wizardlivetvguide.js

merge from dev

2015-12-14 10:43:03 -05:00

wizardlivetvtuner.js

merge from dev

2015-12-14 10:43:03 -05:00

wizardservice.js

update tabs

2015-09-01 10:01:59 -04:00

wizardsettings.js

merge from dev

2015-12-14 10:43:03 -05:00

wizardstartpage.js

merge from dev

2015-12-14 10:43:03 -05:00

wizarduserpage.js

update emby connect error message

2015-12-30 17:13:22 -05:00