crobibero
|
dee7bdddb6
|
fix build
|
2020-08-03 14:49:24 -06:00 |
|
crobibero
|
f915c3e5d9
|
Merge remote-tracking branch 'upstream/master' into api-migration
|
2020-08-03 11:24:13 -06:00 |
|
Matt Montgomery
|
a40fe86776
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-07-26 16:14:58 -05:00 |
|
Patrick Barron
|
3d69cea1c9
|
Merge branch 'master' into displaypreferences-efcore
|
2020-07-23 23:50:12 +00:00 |
|
Joshua M. Boniface
|
22cc602117
|
Merge pull request #3366 from barronpm/remove-usermanager-addparts
Remove UserManager.AddParts
|
2020-07-23 18:05:57 -04:00 |
|
Patrick Barron
|
200f369596
|
Use interfaces in app host constructors
|
2020-07-22 19:34:14 -04:00 |
|
David
|
5580df38e6
|
Cleanup after merge
|
2020-07-22 11:05:41 +02:00 |
|
David
|
90039e1ad3
|
Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
# Jellyfin.Api/Helpers/TranscodingJobHelper.cs
|
2020-07-22 11:02:44 +02:00 |
|
crobibero
|
1385064497
|
Merge remote-tracking branch 'upstream/master' into api-migration-merge
|
2020-07-20 14:28:33 -06:00 |
|
David
|
3514813eb4
|
Continute work
|
2020-07-19 19:03:48 +02:00 |
|
Patrick Barron
|
ab396225ea
|
Migrate Display Preferences to EF Core
|
2020-07-17 16:11:53 -04:00 |
|
Patrick Barron
|
303c175714
|
Fix circular dependency
|
2020-07-13 17:25:50 -04:00 |
|
Patrick Barron
|
3b085f6a03
|
Remove UserManager.AddParts
|
2020-07-13 17:25:50 -04:00 |
|
Anthony Lavado
|
3d3e66c5d1
|
Merge pull request #3513 from barronpm/plugin-exception-fix
Fix TypeLoadException during plugin load
|
2020-07-05 13:55:24 -07:00 |
|
Patrick Barron
|
942c733d4f
|
Fix TypeLoadException during plugin load
|
2020-07-05 15:38:35 -04:00 |
|
Bond_009
|
ae6eaa7f02
|
Minor fixes
|
2020-07-04 22:06:27 +02:00 |
|
Neil Burrows
|
4748df26b6
|
Remove un-needed comment
|
2020-06-29 17:25:12 +01:00 |
|
Neil Burrows
|
4389773508
|
Respect FFMpeg path passed via Environment Variable
|
2020-06-29 17:17:28 +01:00 |
|
BaronGreenback
|
ba3a9f7d46
|
removing stray < character from description.
|
2020-06-22 12:14:31 +01:00 |
|
BaronGreenback
|
a25a233b75
|
Using Version class.
|
2020-06-22 11:57:46 +01:00 |
|
BaronGreenback
|
bf1bbbdd3e
|
Changed sorting to case insensitive
|
2020-06-21 18:46:48 +01:00 |
|
BaronGreenback
|
2255bc9872
|
Changed padding in version numbers based up how they are stored in the repository.
|
2020-06-21 18:42:50 +01:00 |
|
BaronGreenback
|
d89c46f1a9
|
fixes
|
2020-06-21 17:11:21 +01:00 |
|
BaronGreenback
|
99410f3c97
|
fixes
|
2020-06-21 16:15:55 +01:00 |
|
BaronGreenback
|
a041fe8a2d
|
Add versioning to plugin folders
|
2020-06-21 13:29:35 +01:00 |
|
Cody Robibero
|
43221fc26b
|
Merge branch 'master' into SSDP
|
2020-06-20 15:33:13 -06:00 |
|
David
|
64fb173dad
|
Move DashboardController to Jellyfin.Api
|
2020-06-20 15:59:41 +02:00 |
|
ConfusedPolarBear
|
e2f16fc255
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-06-19 23:33:43 -05:00 |
|
telans
|
9018f8d8be
|
Add full stop at end of comments (SA1629)
|
2020-06-16 10:37:52 +12:00 |
|
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
2020-06-13 19:41:05 -04:00 |
|
ConfusedPolarBear
|
7d9b552403
|
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
2020-06-09 13:28:40 -05:00 |
|
crobibero
|
44957c5a9a
|
Use typed logger where possible
|
2020-06-05 18:15:56 -06:00 |
|
ConfusedPolarBear
|
5d281adedd
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
2020-05-29 17:42:42 -05:00 |
|
Patrick Barron
|
01ce56016a
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
|
2020-05-26 20:29:11 -04:00 |
|
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
2020-05-26 10:23:09 +02:00 |
|
Patrick Barron
|
3eeb6576d8
|
Migrate User DB to EF Core
|
2020-05-20 10:04:00 -04: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 |
|
gion
|
029bb80910
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
2020-05-15 18:59:35 +02:00 |
|
Patrick Barron
|
953777f1ba
|
Removed unnecessary usings
|
2020-05-14 18:12:51 -04:00 |
|
Patrick Barron
|
87c63e668c
|
Merge branch 'master' into activitydb-efcore
|
2020-05-14 21:16:43 +00:00 |
|
Patrick Barron
|
b94afc597c
|
Address review comments
|
2020-05-14 17:13:45 -04:00 |
|
Mark Monteiro
|
2e09311a93
|
Merge branch 'master' into websocket
|
2020-05-14 11:08:08 -04:00 |
|
Patrick Barron
|
a8f0d0aa0d
|
Merge branch 'master' into activitydb-efcore
|
2020-05-13 19:06:04 +00:00 |
|
Vasily
|
f08830ea00
|
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
|
2020-05-13 20:36:54 +03:00 |
|
Patrick Barron
|
b7621d762c
|
2nd half of changes
|
2020-05-13 00:00:57 -04:00 |
|
Patrick Barron
|
9ad839c776
|
Initial migration code
|
2020-05-12 22:10:35 -04:00 |
|
Patrick Barron
|
62420a6eb1
|
Remove support for injecting ILogger directly
|
2020-05-12 16:03:15 -04:00 |
|
Mark Monteiro
|
3abf870c1e
|
Do not include a double slash in URLs when a base URL is not set
|
2020-05-10 18:07:56 -04:00 |
|
Mark Monteiro
|
dc5165b97f
|
Merge branch 'master' into simplify-https-config
|
2020-05-10 14:43:57 -04:00 |
|
Mark Monteiro
|
43c22a5822
|
Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
|
2020-05-10 14:36:11 -04:00 |
|