Luke Pulverenti 8a2e023e28 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
..
Devices
Dlna
Images	adjust fileshare	2015-12-12 23:54:45 -05:00
Library	Merge pull request #1299 from MediaBrowser/master	2015-12-05 20:45:06 -05:00
LiveTv
Movies	added new parent methods	2015-11-11 09:56:31 -05:00
Music
Playback	update transcoding throttle	2016-01-09 12:58:27 -05:00
Properties
Reports	add a new endpoint param IsFavorite and use it for reports	2016-01-12 13:22:52 +11:00
ScheduledTasks
Session
Social
Subtitles
Sync
System	add EndPointInfo class	2016-01-09 16:27:30 -05:00
UserLibrary	Merge branch 'dev'	2016-01-11 21:55:52 -05:00
ApiEntryPoint.cs	reduce excess logging	2016-01-09 12:58:47 -05:00
BaseApiService.cs	update ScheduleDirect	2015-11-10 13:58:05 -05:00
BrandingService.cs
ChannelService.cs
ConfigurationService.cs
ConnectService.cs
DisplayPreferencesService.cs
EnvironmentService.cs	update use of FileAttributes	2015-11-12 15:51:39 -05:00
FilterService.cs
GamesService.cs	added new parent methods	2015-11-11 09:56:31 -05:00
IHasDtoOptions.cs
IHasItemFields.cs
ItemLookupService.cs
ItemRefreshService.cs
ItemUpdateService.cs
LocalizationService.cs
MediaBrowser.Api.csproj	fix merge conflicts	2015-12-27 14:22:55 -05:00
NewsService.cs
NotificationsService.cs
PackageReviewService.cs
packages.config	update translations	2015-11-19 21:54:33 -05:00
PackageService.cs	get stable and beta server packages from github	2016-01-02 20:23:09 -05:00
PlaylistService.cs
PluginService.cs	fix post request	2015-11-25 12:22:20 -05:00
SearchService.cs	added new parent methods	2015-11-11 09:56:31 -05:00
SimilarItemsHelper.cs
StartupWizardService.cs	update components	2015-11-20 19:12:44 -05:00
TvShowsService.cs	update item queries	2015-10-29 15:01:04 -04:00
UserService.cs
VideosService.cs