Luke Pulverenti 2da0e19d81 fix merge conflict		2015-12-19 23:36:16 -05:00
..
bower_components	fix merge conflict	2015-12-19 23:36:16 -05:00
components	Merge pull request #1340 from MediaBrowser/master	2015-12-19 22:29:28 -05:00
css	update now playing bar css	2015-12-17 12:06:37 -05:00
devices	fix merge conflict	2015-12-19 10:54:44 -05:00
files
legacy	update components	2015-12-16 16:27:19 -05:00
scripts	fix merge conflict	2015-12-19 23:36:16 -05:00
strings	Merge pull request #1333 from MediaBrowser/master	2015-12-18 23:31:13 -05:00
themes	fix merge conflict	2015-12-19 23:36:16 -05:00
thirdparty	get api libs from bower	2015-12-16 00:30:14 -05:00
voice	merge from dev	2015-12-14 10:43:03 -05:00
about.html
addplugin.html	merge from dev	2015-12-14 10:43:03 -05:00
advanced.html	merge from dev	2015-12-14 10:43:03 -05:00
appservices.html
autoorganizelog.html	merge from dev	2015-12-14 10:43:03 -05:00
autoorganizetv.html	merge from dev	2015-12-14 10:43:03 -05:00
channelitems.html	merge from dev	2015-12-14 10:43:03 -05:00
channels.html	merge from dev	2015-12-14 10:43:03 -05:00
channelsettings.html	update library setup	2015-10-16 00:46:41 -04:00
cinemamodeconfiguration.html	merge from dev	2015-12-14 10:43:03 -05:00
collections.html	merge from dev	2015-12-14 10:43:03 -05:00
connectlogin.html	merge from dev	2015-12-14 10:43:03 -05:00
dashboard.html	merge from dev	2015-12-14 10:43:03 -05:00
dashboardgeneral.html	merge from dev	2015-12-14 10:43:03 -05:00
dashboardhosting.html	merge from dev	2015-12-14 10:43:03 -05:00
device.html	merge from dev	2015-12-14 10:43:03 -05:00
devices.html
devicesupload.html	merge from dev	2015-12-14 10:43:03 -05:00
dlnaprofile.html
dlnaprofiles.html
dlnaserversettings.html
dlnasettings.html
edititemmetadata.html	merge from dev	2015-12-14 10:43:03 -05:00
encodingsettings.html	merge from dev	2015-12-14 10:43:03 -05:00
favicon.ico
favorites.html	merge from dev	2015-12-14 10:43:03 -05:00
forgotpassword.html	merge from dev	2015-12-14 10:43:03 -05:00
forgotpasswordpin.html	merge from dev	2015-12-14 10:43:03 -05:00
gamegenres.html
games.html
gamesrecommended.html
gamestudios.html
gamesystems.html
index.html	merge from dev	2015-12-14 10:43:03 -05:00
itemdetails.html	merge from dev	2015-12-14 10:43:03 -05:00
itemlist.html	merge from dev	2015-12-14 10:43:03 -05:00
kids.html
library.html	startup wizard fixes	2015-10-26 14:23:46 -04:00
librarypathmapping.html	startup wizard fixes	2015-10-26 14:23:46 -04:00
librarysettings.html	startup wizard fixes	2015-10-26 14:23:46 -04:00
livetv.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvguideprovider.html
livetvitems.html
livetvrecordinglist.html
livetvseriestimer.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvsettings.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvstatus.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvtimer.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvtunerprovider-hdhomerun.html	merge from dev	2015-12-14 10:43:03 -05:00
livetvtunerprovider-m3u.html	merge from dev	2015-12-14 10:43:03 -05:00
log.html
login.html	merge from dev	2015-12-14 10:43:03 -05:00
manifest.json	merge from dev	2015-12-14 10:43:03 -05:00
metadata.html	merge from dev	2015-12-14 10:43:03 -05:00
metadataadvanced.html	merge from dev	2015-12-14 10:43:03 -05:00
metadataimages.html	merge from dev	2015-12-14 10:43:03 -05:00
metadatanfo.html	merge from dev	2015-12-14 10:43:03 -05:00
metadatasubtitles.html	merge from dev	2015-12-14 10:43:03 -05:00
movies.html	merge from dev	2015-12-14 10:43:03 -05:00
music.html	merge from dev	2015-12-14 10:43:03 -05:00
mypreferencesdisplay.html	merge from dev	2015-12-14 10:43:03 -05:00
mypreferenceshome.html	merge from dev	2015-12-14 10:43:03 -05:00
mypreferenceslanguages.html	merge from dev	2015-12-14 10:43:03 -05:00
mypreferencesmenu.html	merge from dev	2015-12-14 10:43:03 -05:00
myprofile.html	merge from dev	2015-12-14 10:43:03 -05:00
mysync.html	merge from dev	2015-12-14 10:43:03 -05:00
mysyncjob.html	merge from dev	2015-12-14 10:43:03 -05:00
mysyncsettings.html	merge from dev	2015-12-14 10:43:03 -05:00
notificationlist.html	merge from dev	2015-12-14 10:43:03 -05:00
notificationsetting.html
notificationsettings.html
nowplaying.html	merge from dev	2015-12-14 10:43:03 -05:00
photos.html	merge from dev	2015-12-14 10:43:03 -05:00
playbackconfiguration.html
playlists.html
plugincatalog.html
plugins.html
reports.html
scheduledtask.html
scheduledtasks.html	merge from dev	2015-12-14 10:43:03 -05:00
search.html
secondaryitems.html
selectserver.html	merge from dev	2015-12-14 10:43:03 -05:00
shared.html	merge from dev	2015-12-14 10:43:03 -05:00
streamingsettings.html
support.html
supporterkey.html
syncactivity.html	merge from dev	2015-12-14 10:43:03 -05:00
syncjob.html	merge from dev	2015-12-14 10:43:03 -05:00
syncsettings.html	merge from dev	2015-12-14 10:43:03 -05:00
tv.html	merge from dev	2015-12-14 10:43:03 -05:00
useredit.html
userlibraryaccess.html	support null image encoder	2015-10-26 01:29:32 -04:00
usernew.html
userparentalcontrol.html	update directoryBrowser	2015-10-16 18:21:03 -04:00
userpassword.html	merge from dev	2015-12-14 10:43:03 -05:00
userprofiles.html	switch drag & drop lib	2015-10-22 11:03:08 -04:00
vulcanize.txt
wizardagreement.html	merge from dev	2015-12-14 10:43:03 -05:00
wizardfinish.html	update links	2015-11-20 15:38:27 -05:00
wizardlibrary.html
wizardlivetvguide.html
wizardlivetvtuner.html	merge from dev	2015-12-14 10:43:03 -05:00
wizardservice.html	startup wizard fixes	2015-10-26 14:23:46 -04:00
wizardsettings.html	merge from dev	2015-12-14 10:43:03 -05:00
wizardstart.html	merge from dev	2015-12-14 10:43:03 -05:00
wizarduser.html	merge from dev	2015-12-14 10:43:03 -05:00