Commit Graph

49 Commits

Author SHA1 Message Date
Erwin de Haan
a358631040 Extra formatting on the merged code. 2019-01-15 17:35:33 +01:00
Erwin de Haan
49b61f238e Merge branch 'dev' into reformat
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
Claus Vium
eca3c099d9 removed a bunch of validation, security, registration, premiere, whatever bs 2019-01-15 16:48:21 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan
b67c1b933e Visual Studio Reformat: MediaBrowser.Api 2019-01-13 20:24:58 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
Bond_009
95a5dd8810 Fix log dir 2019-01-02 02:30:59 +03:00
Bond_009
0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
stefan
48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti
d7a1a87009 reduce work done by system info endpoints 2017-12-01 12:03:40 -05:00
Luke Pulverenti
4f09c1e06d reduce dlna chatter 2017-11-23 10:46:16 -05:00
Luke Pulverenti
983b51e083 reduce socket activity 2017-10-04 14:51:26 -04:00
Luke Pulverenti
4ceb9eb6c5 update restart function 2017-09-09 14:51:24 -04:00
Luke Pulverenti
c4176d2320 add web socket error handling 2017-09-03 21:24:20 -04:00
Luke Pulverenti
504f56d841 update request classes 2017-09-03 14:38:26 -04:00
Luke Pulverenti
1ad990ad72 update live tv data transfer 2017-08-19 15:43:35 -04:00
Luke Pulverenti
40442f887b consolidate emby.server.core into emby.server.implementations 2017-08-09 15:56:38 -04:00
Luke Pulverenti
33014f77aa update GetItems method 2017-05-26 02:48:54 -04:00
Luke Pulverenti
04b6f23473 3.2.9.1 2017-03-29 02:26:48 -04:00
Luke Pulverenti
13d8110ce2 make api project portable 2016-10-31 23:07:45 -04:00
Luke Pulverenti
ef6b90b8e6 make controller project portable 2016-10-25 15:02:04 -04:00
Luke Pulverenti
78ba88bc7e move classes to model 2016-10-23 20:09:43 -04:00
Luke Pulverenti
cffc9417c7 update startup wizard 2016-06-23 13:04:18 -04:00
Luke Pulverenti
7627c6707d update components 2016-06-19 12:53:43 -04:00
Luke Pulverenti
759f5a8560 update task results 2016-06-19 02:18:29 -04:00
Sven Van den brande
168587b2a0 Remove unused code... 2016-03-27 23:11:27 +02:00
Luke Pulverenti
18a6cd629c add EndPointInfo class 2016-01-09 16:27:30 -05:00
Luke Pulverenti
b2548a83b6 restore changes 2016-01-02 18:45:21 -05:00
Luke Pulverenti
a8c482ba7e fix merge conflict 2016-01-02 18:27:01 -05:00
Luke Pulverenti
821e824687 better caching of remote data 2016-01-02 16:54:37 -05:00
Luke Pulverenti
3a7329e414 update ping test 2015-12-29 14:06:32 -05:00
Luke Pulverenti
b46ef16ba8 update local address detection 2015-12-28 22:39:38 -05:00
Luke Pulverenti
078277ebc2 continue file system rework 2015-10-04 00:23:11 -04:00
Luke Pulverenti
8ad702060e begin file system rework 2015-10-03 23:38:46 -04:00
Luke
14de062681 update file system methods 2015-09-13 17:32:02 -04:00
Luke Pulverenti
16e4d4599a fix directory browser in startup wizard 2015-09-05 13:19:13 -04:00
Luke Pulverenti
2e53ff1fd0 move files out of common 2014-12-26 14:34:39 -05:00
Luke Pulverenti
a4b75934e5 revise endpoint attributes 2014-11-14 21:31:03 -05:00
Luke Pulverenti
40897bac14 fixes #941 - Rework password recovery and remove IsLocal checks 2014-11-08 22:18:14 -05:00
Luke Pulverenti
b5842f9f19 rework build scripts 2014-11-05 14:28:41 -05:00
Luke Pulverenti
5ca4d60c34 connect updates 2014-10-28 19:17:55 -04:00
Luke Pulverenti
8e2d244749 rework apiclient startup 2014-09-24 18:47:03 -04:00
Luke Pulverenti
45db7d21b2 localize plugin installation process 2014-08-31 15:15:33 -04:00
Luke Pulverenti
8406257349 update translations 2014-08-24 23:54:45 -04:00
Luke Pulverenti
fda7ff5bf2 chromecast updates 2014-08-19 18:28:35 -04:00
Luke Pulverenti
9c5cceb4ec update translations 2014-08-14 09:24:30 -04:00
Luke Pulverenti
7bff666136 update translations 2014-08-11 10:15:53 -04:00
Luke Pulverenti
e84ba17b9f add activity log feature 2014-08-10 18:13:17 -04:00