Luke Pulverenti 1cdb420d2e Merge branch 'beta' into dev ... Conflicts: MediaBrowser.Api/StartupWizardService.cs MediaBrowser.Model/Configuration/ServerConfiguration.cs MediaBrowser.Server.Implementations/Dto/DtoService.cs MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs MediaBrowser.Server.Implementations/Library/LibraryManager.cs MediaBrowser.Server.Implementations/Localization/Core/ca.json MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj MediaBrowser.Server.Implementations/packages.config MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json SharedVersion.cs		2016-02-01 22:21:58 -05:00
..
Activity
Branding
Channels	Merge branch 'beta' into dev	2016-02-01 22:21:58 -05:00
Collections	update timeline view	2015-11-14 11:58:01 -05:00
Configuration	add back MergeMetadataAndImagesByName	2016-01-27 01:33:59 -05:00
Connect	add null check to PeriodicTimer	2016-01-29 00:17:35 -05:00
Devices	rework device concurrency	2016-01-26 13:20:18 -05:00
Dto	support photo orientation	2016-01-21 11:58:07 -05:00
EntryPoints	update timer	2016-01-30 13:49:50 -05:00
FileOrganization	update episode organizer	2016-01-30 13:50:51 -05:00
HttpServer	add message for db upgrade	2016-02-01 14:54:49 -05:00
Intros	update intro provider	2015-12-14 12:16:54 -05:00
IO	fixes #1410 - Entire server locks up, when files are locked during.. things..	2016-01-27 13:44:42 -05:00
Library	fix null reference	2016-02-01 12:03:07 -05:00
LiveTv	Merge branch 'beta' into dev	2016-02-01 22:21:58 -05:00
Localization	update translations	2016-02-01 21:40:48 -05:00
Logging
MediaEncoder	update polymer components	2015-12-09 11:59:23 -05:00
News	update use of timers	2016-01-30 13:49:12 -05:00
Notifications
Persistence	add message for db upgrade	2016-02-01 14:54:49 -05:00
Photos	update providers	2015-12-03 12:03:47 -05:00
Playlists	added new parent methods	2015-11-11 09:56:31 -05:00
Properties
ScheduledTasks	get stable and beta server packages from github	2016-01-08 20:59:48 -05:00
Security	add back api keys	2016-01-19 22:03:57 -05:00
ServerManager
Session	added new parent methods	2015-11-11 09:56:31 -05:00
Social
Sorting
Sync	Merge pull request #1339 from MediaBrowser/master	2015-12-19 15:23:46 -05:00
TV	added new parent methods	2015-11-11 09:56:31 -05:00
Udp
UserViews	update providers	2015-12-03 12:03:47 -05:00
app.config
MediaBrowser.Server.Implementations.csproj	update naming project	2016-02-01 21:41:00 -05:00
packages.config	update naming project	2016-02-01 21:41:00 -05:00
ServerApplicationPaths.cs