Commit graph

7299 commits

Author SHA1 Message Date
Luke Pulverenti d8c654f329 stub out pin login service 2016-02-04 12:50:24 -05:00
Luke Pulverenti c82124f2e9 3.0.5864 2016-02-03 17:43:52 -05:00
Luke Pulverenti dff32c2404 update migration 2016-02-03 17:43:27 -05:00
Luke Pulverenti 0b5b409354 update migration 2016-02-03 17:42:33 -05:00
Luke Pulverenti 001c3c99b3 3.0.5863 2016-02-03 16:57:29 -05:00
Luke Pulverenti 07cfac913b update upgrade process 2016-02-03 16:57:02 -05:00
Luke Pulverenti 00ae190a27 update upgrade process 2016-02-03 16:56:00 -05:00
Luke Pulverenti 7d26b8995f increase startup timeout 2016-02-03 16:07:38 -05:00
Luke Pulverenti 15617b4806 update naming project 2016-02-03 16:07:28 -05:00
Luke Pulverenti 14e9e88f6a update naming project 2016-02-03 16:06:04 -05:00
Luke Pulverenti 493662d67d 3.0.5862 2016-02-03 15:56:48 -05:00
Luke Pulverenti fb2a320416 update upgrade process 2016-02-03 15:55:00 -05:00
Luke Pulverenti 4fc3753f64 start library scan after database clean 2016-02-03 15:54:47 -05:00
Luke Pulverenti 86925d5be0 increase startup timeout 2016-02-03 15:54:40 -05:00
Luke Pulverenti d962fa6685 update naming project 2016-02-03 15:54:29 -05:00
Luke Pulverenti 6cb1f77789 update upgrade process 2016-02-03 15:52:45 -05:00
Luke Pulverenti 89a3a77110 start library scan after database clean 2016-02-03 12:27:00 -05:00
Luke Pulverenti b5b8f8615e increase startup timeout 2016-02-03 12:26:45 -05:00
Luke Pulverenti dbcce232bd update naming project 2016-02-03 12:26:34 -05:00
Luke Pulverenti e208258a23 3.0.5861 2016-02-02 21:56:34 -05:00
Luke Pulverenti e602577401 update clean db task 2016-02-02 21:54:49 -05:00
Luke Pulverenti 998f7c0fb8 update clean db task 2016-02-02 21:51:00 -05:00
Luke 746066c346 update mac project 2016-02-02 15:03:16 -05:00
Luke Pulverenti 4e6d3dba5b 3.0.5860 2016-02-01 22:25:47 -05:00
Luke Pulverenti 04317f66b7 merge from dev 2016-02-01 22:24:58 -05:00
Luke Pulverenti 16de4de003 Merge branch 'dev' into beta 2016-02-01 22:22:18 -05:00
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
Luke Pulverenti bb26e05e1e update mac project 2016-02-01 22:14:35 -05:00
Luke Pulverenti a9eba7099b update naming project 2016-02-01 21:41:00 -05:00
Luke Pulverenti f5f2565b58 update translations 2016-02-01 21:40:48 -05:00
Luke Pulverenti e6b31ac6f4 3.0.5821 2016-02-01 16:03:19 -05:00
Luke Pulverenti 246f10406c update ffmpeg 2016-02-01 16:01:20 -05:00
Luke Pulverenti 11e5d194b4 3.0.5859 2016-02-01 15:44:17 -05:00
Luke Pulverenti 96120099cb add message for db upgrade 2016-02-01 14:54:49 -05:00
Luke Pulverenti 54016092d8 3.0.5858 2016-02-01 14:26:31 -05:00
Luke 88d0c2d40a Merge pull request #1429 from MediaBrowser/master
merge from master
2016-02-01 14:27:16 -05:00
Luke Pulverenti 008522226f 3.0.5820 2016-02-01 14:25:16 -05:00
Luke Pulverenti 37352785ac Merge branch 'beta' 2016-02-01 14:24:15 -05:00
Luke Pulverenti f5ebeddbf5 Merge branch 'master' into beta
Conflicts:
	MediaBrowser.Providers/People/MovieDbPersonProvider.cs
	MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.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/scripts/librarybrowser.js
	MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js
2016-02-01 14:23:58 -05:00
Luke Pulverenti f14e9b8d3a fix merge conflict 2016-02-01 14:21:22 -05:00
Luke Pulverenti bd1bde4f13 update mac project 2016-02-01 14:17:35 -05:00
Luke Pulverenti 2b82f0ac51 3.0.5857 2016-02-01 14:14:00 -05:00
Luke Pulverenti 2d7186b97a 3.0.5856 2016-02-01 12:25:33 -05:00
Luke Pulverenti 865e2babfa album refresh fixes 2016-02-01 12:24:05 -05:00
Luke Pulverenti 025958a22d update interlaced detection 2016-02-01 12:23:54 -05:00
Luke Pulverenti 4d7c016224 album refresh fixes 2016-02-01 12:22:02 -05:00
Luke Pulverenti 6cb82d6c93 fix null reference 2016-02-01 12:03:07 -05:00
Luke Pulverenti 51df0b79f2 update interlaced detection 2016-02-01 12:02:58 -05:00
Luke Pulverenti 552694bb38 3.0.5855 2016-01-31 20:02:23 -05:00
Luke Pulverenti 0297d8f7d3 update locking 2016-01-31 20:00:04 -05:00