lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,983 Commits 2 Branches 0 Tags 64 MiB
07cfac913b
Commit Graph

2422 Commits

Author SHA1 Message Date
Luke Pulverenti
07cfac913b update upgrade process 2016-02-03 16:57:02 -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
d962fa6685 update naming project 2016-02-03 15:54:29 -05:00
Luke Pulverenti
e602577401 update clean db task 2016-02-02 21:54:49 -05:00
Luke Pulverenti
04317f66b7 merge from dev 2016-02-01 22:24:58 -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
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
96120099cb add message for db upgrade 2016-02-01 14:54:49 -05:00
Luke Pulverenti
6cb82d6c93 fix null reference 2016-02-01 12:03:07 -05:00
Luke Pulverenti
0297d8f7d3 update locking 2016-01-31 20:00:04 -05:00
Luke Pulverenti
fb91b7c808 update locking 2016-01-31 19:57:40 -05:00
Luke Pulverenti
dc43c1077d merge from dev 2016-01-30 16:32:58 -05:00
Luke Pulverenti
fae9b18481 update episode organizer 2016-01-30 13:50:51 -05:00
Luke Pulverenti
b1c9984498 update timer 2016-01-30 13:49:50 -05:00
Luke Pulverenti
00de5b1ca7 update use of timers 2016-01-30 13:49:12 -05:00
Luke Pulverenti
0361b8b0e8 don't organize with unknown episode name 2016-01-30 13:49:03 -05:00
Luke Pulverenti
fc6d22a81b update episode organizer 2016-01-29 23:54:55 -05:00
Luke Pulverenti
e20de8ffad update timer 2016-01-29 21:42:53 -05:00
Luke Pulverenti
47ea69f0de update use of timers 2016-01-29 14:20:09 -05:00
Luke Pulverenti
e906bdc06e don't organize with unknown episode name 2016-01-29 13:29:09 -05:00
Luke Pulverenti
352595bc16 add null check to PeriodicTimer 2016-01-29 00:17:35 -05:00
Luke Pulverenti
cfa8f6c6ec reduce use of timers throughout the system 
Conflicts:
	MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
 2016-01-29 00:17:20 -05:00
Luke Pulverenti
74d85e8b19 update recording logging 2016-01-29 00:14:57 -05:00
Luke Pulverenti
a38cf5566a update recording logging 2016-01-28 22:43:20 -05:00
Luke Pulverenti
3268de0edf add null check to PeriodicTimer 2016-01-28 22:42:03 -05:00
Luke Pulverenti
3510ef3d2b reduce use of timers throughout the system 2016-01-28 22:40:21 -05:00
Luke Pulverenti
9d6f1a8b61 update recording logging 2016-01-28 14:18:47 -05:00
Luke Pulverenti
2d97423a40 don't organize episode if series has no provider ids 2016-01-28 14:18:30 -05:00
Luke Pulverenti
8c7296b560 update translations 2016-01-28 14:16:26 -05:00
Luke Pulverenti
f0adb2e891 restore channel view setting 2016-01-28 14:16:06 -05:00
Luke Pulverenti
8f291320c9 update recording logging 2016-01-28 14:10:56 -05:00
Luke Pulverenti
ce813c40c9 don't organize episode if series has no provider ids 2016-01-28 13:29:41 -05:00
Luke Pulverenti
58a87f203f update translations 2016-01-27 14:39:10 -05:00
Luke Pulverenti
6003ba4c58 restore channel view setting 2016-01-27 14:28:12 -05:00
Luke Pulverenti
2bd0464322 fixes #1410 - Entire server locks up, when files are locked during.. things.. 2016-01-27 13:44:42 -05:00
Luke Pulverenti
ddf7fdbcef fixes #1421 - LogRequest() in WebSocketSharpListener broken for Reports 2016-01-27 13:44:32 -05:00
Luke Pulverenti
c167f79238 update photo resolver to exclude generated images 2016-01-27 13:44:23 -05:00
Luke Pulverenti
bd082e9157 fixes #1410 - Entire server locks up, when files are locked during.. things.. 2016-01-27 13:42:19 -05:00
Luke Pulverenti
0474a225c4 fixes #1421 - LogRequest() in WebSocketSharpListener broken for Reports 2016-01-27 13:35:37 -05:00
Luke Pulverenti
361dedc314 update photo resolver to exclude generated images 2016-01-27 12:34:23 -05:00
Luke Pulverenti
2b8cf9b89d add logging 2016-01-27 12:14:48 -05:00
Luke Pulverenti
ea378d7850 add logging 2016-01-27 11:58:08 -05:00
Luke Pulverenti
2bb234c1f8 comment out satip discovery 2016-01-27 11:57:56 -05:00
Luke Pulverenti
106a2f3e1a add back MergeMetadataAndImagesByName 
Conflicts:
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
 2016-01-27 01:33:59 -05:00
Luke Pulverenti
95ae1c5f7b add back MergeMetadataAndImagesByName 2016-01-27 01:31:31 -05:00
Luke Pulverenti
51cd5e90b0 restart timers on wake 2016-01-27 01:11:20 -05:00
Luke Pulverenti
1ea2ec9bdc support itunes episode naming 2016-01-27 01:10:29 -05:00
Luke Pulverenti
eb1ab74759 restart timers on wake 2016-01-27 01:07:01 -05:00