Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 22:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
7020 commits 23 branches 76 tags 1.3 GiB
Commit graph

7020 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Pulverenti 00ff642f19 3.0.5866 2016-02-05 23:53:46 -05:00
Luke Pulverenti e72f59f8cd Merge branch 'dev' into beta 2016-02-05 23:51:29 -05:00
Luke Pulverenti 00d24d6676 Merge branch 'beta' into dev 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
 2016-02-05 23:51:15 -05:00
Luke Pulverenti 7236ce0f92 ensure server reports consistent uuid 2016-02-05 23:39:10 -05:00
Luke Pulverenti 60147b5a0b update translations 2016-02-05 22:06:05 -05:00
Luke Pulverenti 785b20b48c update project 2016-02-05 21:57:35 -05:00
Luke Pulverenti 78a90a4884 save photo album images as folder.ext 2016-02-05 21:13:36 -05:00
Luke Pulverenti 16145380d9 update android init 2016-02-05 12:04:38 -05:00
Luke Pulverenti 32013f5ae5 deprecate merge setting 2016-02-05 11:04:18 -05:00
Luke Pulverenti b94dc9d31a revert origin change 2016-02-05 11:04:04 -05:00
Luke Pulverenti 4ba4072e63 add credentials to media elements 2016-02-05 10:31:11 -05:00
Luke Pulverenti bd5bad4f88 update translations 2016-02-05 09:32:05 -05:00
Luke Pulverenti f9260a99d6 update translations 2016-02-05 01:03:41 -05:00
Luke Pulverenti ee274b0369 restore legacy folder 2016-02-05 00:59:33 -05:00
Luke Pulverenti b9c8c4e346 fix issue with intros before being scanned 2016-02-05 00:59:22 -05:00
Luke Pulverenti 0b7d024afd support codec intros 2016-02-05 00:59:09 -05:00
Luke Pulverenti dd5f8f0794 add recording logging 2016-02-04 22:44:44 -05:00
Luke Pulverenti 3a059971db use shared prompt 2016-02-04 15:51:13 -05:00
Luke Pulverenti 2124c55169 update packaging 2016-02-04 14:31:12 -05:00
Luke Pulverenti d1de9e0179 update sync encoding to match streaming 2016-02-04 14:31:04 -05:00
Luke Pulverenti 3925a7ca5f 3.0.5865 2016-02-04 13:25:07 -05:00
Luke Pulverenti 94c70af4ad update db migration 2016-02-04 13:22:57 -05:00
Luke Pulverenti e5f80aebd0 update pin login service 2016-02-04 13:22:48 -05:00
Luke Pulverenti fa42486e1c stub out pin login service 2016-02-04 13:22:39 -05:00
Luke Pulverenti d28ef71d93 update db migration 2016-02-04 13:04:04 -05:00
Luke Pulverenti 7614707dad update pin login service 2016-02-04 13:03:40 -05:00
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 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 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