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 |
Vasily
|
d21feb2b18
|
Merge pull request #2970 from barronpm/activitydb-efcore
Migrate Activity Database to Entity Framework Core
|
5 years ago |
Frank Riley
|
9ee10d22c8
|
Rename function
|
5 years ago |
Frank Riley
|
3cb6fd8a27
|
Fix #3083: Set the Access-Control-Allow-Origin header to the request origin/host header if possible
|
5 years ago |
Patrick Barron
|
87c63e668c
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
Mark Monteiro
|
2e09311a93
|
Merge branch 'master' into websocket
|
5 years ago |
Patrick Barron
|
1fecd55ac0
|
Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore
|
5 years ago |
Patrick Barron
|
1e9b2613c6
|
Remove more unused code
|
5 years ago |
Patrick Barron
|
a8f0d0aa0d
|
Merge branch 'master' into activitydb-efcore
|
5 years ago |
Patrick Barron
|
511d20a100
|
Apply review suggestions
|
5 years ago |
Mark Monteiro
|
51cdb30741
|
Apply documentation suggestions from code review
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
|
5 years ago |
Patrick Barron
|
b7621d762c
|
2nd half of changes
|
5 years ago |
Patrick Barron
|
c1360a1dc3
|
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Entities/User.cs
# Jellyfin.Data/ISavingChanges.cs
# Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
# Jellyfin.Server.Implementations/JellyfinDb.cs
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Model/Notifications/NotificationOptions.cs
# MediaBrowser.sln
|
5 years ago |
Patrick Barron
|
9ad839c776
|
Initial migration code
|
5 years ago |
Mark Monteiro
|
3abf870c1e
|
Do not include a double slash in URLs when a base URL is not set
|
5 years ago |
Mark Monteiro
|
dc5165b97f
|
Merge branch 'master' into simplify-https-config
|
5 years ago |
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
|
5 years ago |
Bond-009
|
62da4d0e5c
|
Merge pull request #2492 from Polpetta/fix-api-private-data-leak
Fix emby/user/public API leaking sensitive data
|
5 years ago |
Bond_009
|
3623aafcb6
|
Make SonarCloud happy
|
5 years ago |
Bond_009
|
15634a1913
|
Merge branch 'master' into websocket
|
5 years ago |
Vasily
|
8607b6a997
|
Merge pull request #2817 from ferferga/master
Remove unnecessary space in hardware decoders argument for ffmpeg
|
5 years ago |
Mark Monteiro
|
679f97d5e9
|
Merge remote-tracking branch 'upstream/master' into simplify-https-config
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
|
5 years ago |
Joshua M. Boniface
|
00d8983d7c
|
Merge pull request #2990 from mark-monteiro/create-missing-folders
Create Missing Data Folders
|
5 years ago |
Mark Monteiro
|
7615cdc963
|
Ensure metadata path is created on app startup, and also each time it is updated
|
5 years ago |
Joshua M. Boniface
|
f502c89331
|
Merge pull request #2798 from JustAMan/fix-livetv-again
Make localhost LiveTV restreams always use plain HTTP port
|
5 years ago |
Joshua M. Boniface
|
cbeeeced75
|
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
|
5 years ago |
Joshua M. Boniface
|
6ac723706c
|
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
|
5 years ago |
Joshua M. Boniface
|
0157326354
|
Apply style change
Co-Authored-By: Bond-009 <bond.009@outlook.com>
|
5 years ago |
Mark Monteiro
|
93649ad77b
|
Merge remote-tracking branch 'upstream/master' into simplify-https-config
|
5 years ago |
dkanada
|
97d7ffc458
|
Merge pull request #2861 from mark-monteiro/fix-auth-response-codes
Fix Auth Response Codes
|
5 years ago |
Bond-009
|
d744d7d234
|
Merge branch 'master' into register-services-correctly
|
5 years ago |
Bond-009
|
07326c1d9b
|
Merge branch 'master' into fix-auth-response-codes
|
5 years ago |
Bond-009
|
c0b3c11b2e
|
Merge pull request #2846 from jellyfin/azure
Remove requirement to build web during server builds
|
5 years ago |
Mark Monteiro
|
c5f163293f
|
Add <ProjectGuid> properties to all project files
This is required for SonarCloud analysis to run
|
5 years ago |
Mark Monteiro
|
f815059698
|
Merge remote-tracking branch 'upstream/master' into register-services-correctly
|
5 years ago |
Anthony Lavado
|
ed1dc5c922
|
Remove JsonIgnore from the DateLastSaved property of BaseItem
|
5 years ago |
dkanada
|
3142c9b990
|
Merge pull request #2916 from Bond-009/minor2
Minor improvements
|
5 years ago |
Bond_009
|
a73e1f18b6
|
Minor improvements
|
5 years ago |
dkanada
|
eda208e258
|
Merge pull request #2829 from Bond-009/warn19
Fix some warnings
|
5 years ago |
Mark Monteiro
|
ecf49caf0d
|
Add back warning message when Skia encoder cannot be used
|
5 years ago |
Mark Monteiro
|
00a0e013c6
|
Update documentation for URL methods in ApplicationHost
|
5 years ago |
Mark Monteiro
|
fee76097f4
|
Remove CanConnectWithHttps Property
It is only used in one place and only adds confusion by existing
|
5 years ago |
Mark Monteiro
|
daed41815f
|
Add missing punctuation in xml comment
Co-Authored-By: Bond-009 <bond.009@outlook.com>
|
5 years ago |
Mark Monteiro
|
9728aa8b0a
|
Merge branch 'master' into register-services-correctly
|
5 years ago |
Mark Monteiro
|
98044e7793
|
Document AuthenticationException correctly
|
5 years ago |
Mark Monteiro
|
6d35dd6b32
|
Clean up SecurityException
- Remove unused SecurityExceptionType
- Add missing constructor for InnerException
- Add missing documentation
|
5 years ago |
Joshua M. Boniface
|
bf92694f8b
|
Merge pull request #2715 from nyanmisaka/libfdk-aac
Prefer to use libfdk_aac encoder for better audio quality when it is available
|
5 years ago |
Bond-009
|
84dba64644
|
Merge pull request #2821 from nyanmisaka/mpeg4
Fix MPEG4 broken on VAAPI
|
5 years ago |
Nyanmisaka
|
62d9a48833
|
update as per suggestions
|
5 years ago |
Nyanmisaka
|
e6f65863e3
|
update as per suggestions
|
5 years ago |