Bond-009
|
8ee042483a
|
Merge pull request #2888 from ConfusedPolarBear/quickconnect
Add quick connect (login without typing password)
|
4 years ago |
|
Bond-009
|
95142643f6
|
Merge pull request #3871 from Ullmie02/plugins-api
Allow plugins to define their own api endpoints
|
4 years ago |
David Ullmer
|
b37cc7bfaf
|
Don't evaluate twice
|
4 years ago |
|
David Ullmer
|
7f79f2ee0e
|
Use .Distinct on assembly
|
4 years ago |
Matt Montgomery
|
df0d197dc8
|
Apply suggestions from code review
|
4 years ago |
|
Matt Montgomery
|
2974a0248a
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
4 years ago |
Patrick Barron
|
98ed90c4a2
|
Merge branch 'master' into event-rewrite-1
|
4 years ago |
Patrick Barron
|
a77cf53573
|
Allow plugins to register services.
|
4 years ago |
|
David
|
025ee2163f
|
Change log message, load assembly only once
|
4 years ago |
|
Matt Montgomery
|
4fa3d3f4f3
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
4 years ago |
|
David
|
d296a1f6d0
|
Add logging, cleanup
|
4 years ago |
|
David
|
9e95fe8f9d
|
Add plugin assemblies to mvc builder
|
4 years ago |
crobibero
|
460c3dd351
|
convert dependent controller functions to di helper class
|
4 years ago |
|
crobibero
|
dee7bdddb6
|
fix build
|
4 years ago |
|
crobibero
|
f915c3e5d9
|
Merge remote-tracking branch 'upstream/master' into api-migration
|
4 years ago |
|
Matt Montgomery
|
a40fe86776
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
4 years ago |
|
Patrick Barron
|
3d69cea1c9
|
Merge branch 'master' into displaypreferences-efcore
|
4 years ago |
Joshua M. Boniface
|
22cc602117
|
Merge pull request #3366 from barronpm/remove-usermanager-addparts
Remove UserManager.AddParts
|
4 years ago |
|
Patrick Barron
|
200f369596
|
Use interfaces in app host constructors
|
4 years ago |
|
David
|
5580df38e6
|
Cleanup after merge
|
4 years ago |
|
David
|
90039e1ad3
|
Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio
# Conflicts:
# Emby.Server.Implementations/ApplicationHost.cs
# Jellyfin.Api/Helpers/TranscodingJobHelper.cs
|
4 years ago |
|
crobibero
|
1385064497
|
Merge remote-tracking branch 'upstream/master' into api-migration-merge
|
4 years ago |
|
David
|
3514813eb4
|
Continute work
|
4 years ago |
|
Patrick Barron
|
ab396225ea
|
Migrate Display Preferences to EF Core
|
4 years ago |
|
Patrick Barron
|
303c175714
|
Fix circular dependency
|
4 years ago |
|
Patrick Barron
|
3b085f6a03
|
Remove UserManager.AddParts
|
4 years ago |
Anthony Lavado
|
3d3e66c5d1
|
Merge pull request #3513 from barronpm/plugin-exception-fix
Fix TypeLoadException during plugin load
|
4 years ago |
|
Patrick Barron
|
942c733d4f
|
Fix TypeLoadException during plugin load
|
4 years ago |
|
Bond_009
|
ae6eaa7f02
|
Minor fixes
|
4 years ago |
Neil Burrows
|
4748df26b6
|
Remove un-needed comment
|
4 years ago |
|
Neil Burrows
|
4389773508
|
Respect FFMpeg path passed via Environment Variable
|
4 years ago |
|
Cody Robibero
|
43221fc26b
|
Merge branch 'master' into SSDP
|
4 years ago |
|
David
|
64fb173dad
|
Move DashboardController to Jellyfin.Api
|
4 years ago |
|
ConfusedPolarBear
|
e2f16fc255
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
4 years ago |
telans
|
9018f8d8be
|
Add full stop at end of comments (SA1629)
|
4 years ago |
|
Patrick Barron
|
42b4f0aa2e
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
|
4 years ago |
|
ConfusedPolarBear
|
7d9b552403
|
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
|
5 years ago |
|
crobibero
|
44957c5a9a
|
Use typed logger where possible
|
5 years ago |
|
ConfusedPolarBear
|
5d281adedd
|
Merge remote-tracking branch 'upstream/master' into quickconnect
|
5 years ago |
|
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
|
5 years ago |
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
|
Patrick Barron
|
3eeb6576d8
|
Migrate User DB to EF Core
|
5 years ago |
|
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
|
5 years ago |
|
gion
|
029bb80910
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
|
Patrick Barron
|
953777f1ba
|
Removed unnecessary usings
|
5 years ago |
|
Patrick Barron
|
87c63e668c
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
|
Patrick Barron
|
b94afc597c
|
Address review comments
|
5 years ago |
Mark Monteiro
|
2e09311a93
|
Merge branch 'master' into websocket
|
5 years ago |
|
Patrick Barron
|
a8f0d0aa0d
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
Vasily
|
f08830ea00
|
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
|
5 years ago |
