Patrick Barron
|
9fa4fff15d
|
Merge branch 'master' into event-rewrite-1
# Conflicts:
# Emby.Dlna/Emby.Dlna.csproj
# Emby.Dlna/Eventing/DlnaEventManager.cs
# Emby.Dlna/Service/BaseService.cs
# Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
# MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
|
2020-08-24 20:04:13 -04:00 |
|
Bond_009
|
404bb4f835
|
Enable TreatWarningsAsErrors for MediaBrowser.Controller in Release
|
2020-08-22 21:56:24 +02:00 |
|
Patrick Barron
|
ca1f15af19
|
Move GenericEventArgs to Jellyfin.Data.Events
|
2020-08-13 20:52:55 -04:00 |
|
Patrick Barron
|
06f9cde22f
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
|
2020-06-04 16:52:23 -04:00 |
|
Bond-009
|
2dbb9d4895
|
Fix build
|
2020-06-03 11:54:01 +02:00 |
|
Patrick Barron
|
aca7e221d8
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
|
2020-05-15 17:20:07 -04:00 |
|
Patrick Barron
|
1e9b2613c6
|
Remove more unused code
|
2020-05-13 15:35:14 -04:00 |
|
Patrick Barron
|
511d20a100
|
Apply review suggestions
|
2020-05-13 15:03:35 -04:00 |
|
Patrick Barron
|
9ad839c776
|
Initial migration code
|
2020-05-12 22:10:35 -04: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
|
26ca4b607b
|
Visual Studio Reformat: MediaBrowser.Controller
|
2019-01-13 20:25:32 +01:00 |
|
Andrew Rabert
|
a86b71899e
|
Add GPL modules
|
2018-12-27 18:27:57 -05:00 |
|
stefan
|
48facb797e
|
Update to 3.5.2 and .net core 2.1
|
2018-09-12 19:26:21 +02:00 |
|
Luke Pulverenti
|
9fdaa039c4
|
rework device repository
|
2017-10-13 15:18:05 -04:00 |
|
Luke Pulverenti
|
00cbadea2c
|
update core project
|
2016-11-11 02:24:36 -05:00 |
|
Luke Pulverenti
|
06afe47ee9
|
update server core project
|
2016-11-11 01:43:42 -05:00 |
|
Luke Pulverenti
|
99c991f001
|
save appVersion with device record
|
2015-03-14 21:42:09 -04:00 |
|
Luke Pulverenti
|
63f3cf97da
|
add option to merge metadata and IBN paths
|
2015-01-26 11:47:15 -05:00 |
|
Luke Pulverenti
|
8a9f16ff6a
|
enable user device access
|
2014-12-29 15:18:48 -05:00 |
|
Luke Pulverenti
|
ab3da46113
|
more sync movement
|
2014-12-12 22:56:30 -05:00 |
|
Luke Pulverenti
|
ab3c26c564
|
update connect
|
2014-10-13 16:14:53 -04:00 |
|
Luke Pulverenti
|
314a51dff3
|
add more device options
|
2014-10-11 21:46:02 -04:00 |
|
Luke Pulverenti
|
f3539686bd
|
add device upload options
|
2014-10-11 16:38:13 -04:00 |
|