You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		9 years ago
..
Activity	Add user cinema mode setting	11 years ago
Branding	fixes #762 - Marking unwatched doesn't update display	11 years ago
Channels	Merge branch 'beta' into dev	9 years ago
Collections	update timeline view	9 years ago
Configuration	add back MergeMetadataAndImagesByName	9 years ago
Connect	add null check to PeriodicTimer	9 years ago
Devices	rework device concurrency	9 years ago
Dto	support photo orientation	9 years ago
EntryPoints	update timer	9 years ago
FileOrganization	update episode organizer	9 years ago
HttpServer	add message for db upgrade	9 years ago
IO	fixes #1410 - Entire server locks up, when files are locked during.. things..	9 years ago
Intros	update cinema mode text	9 years ago
Library	fix null reference	9 years ago
LiveTv	Merge branch 'beta' into dev	9 years ago
Localization	update translations	9 years ago
Logging	update components	10 years ago
MediaEncoder	update polymer components	9 years ago
News	update use of timers	9 years ago
Notifications	update metadata editor	10 years ago
Persistence	add message for db upgrade	9 years ago
Photos	update providers	9 years ago
Playlists	added new parent methods	9 years ago
Properties	More DI	12 years ago
ScheduledTasks	get stable and beta server packages from github	9 years ago
Security	add back api keys	9 years ago
ServerManager	add mono CreateWebRequest workaround	10 years ago
Session	added new parent methods	9 years ago
Social	add sharing function	10 years ago
Sorting	update people sorting	10 years ago
Sync	Merge pull request #1339 from MediaBrowser/master	9 years ago
TV	added new parent methods	9 years ago
Udp	updated translations	10 years ago
UserViews	update providers	9 years ago
MediaBrowser.Server.Implementations.csproj	update naming project	9 years ago
ServerApplicationPaths.cs	make channel access opt-in rather than opt out	10 years ago
app.config	update sqlite references	10 years ago
packages.config	update naming project	9 years ago