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 |
Joshua M. Boniface
|
7c72f69189
|
Merge pull request #2733 from OancaAndrei/syncplay
Add syncplay feature
|
5 years ago |
|
Joshua M. Boniface
|
0be3dfe7c5
|
Revert "Fix emby/user/public API leaking sensitive data"
|
5 years ago |
gion
|
e42bfc92f3
|
Fix code issues
|
5 years ago |
|
gion
|
e4838b0faa
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
5 years ago |
|
Patrick Barron
|
56212e8101
|
Warnings cleanup
|
5 years ago |
|
Patrick Barron
|
c464f700db
|
Remove redundant qualifiers
|
5 years ago |
|
Patrick Barron
|
7d9d54d2ec
|
Fix profile images.
|
5 years ago |
Mark Monteiro
|
3ed76d7e08
|
Update to .NET Core 3.1.4
|
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 |
Vasily
|
d21feb2b18
|
Merge pull request #2970 from barronpm/activitydb-efcore
Migrate Activity Database to Entity Framework Core
|
5 years ago |
|
gion
|
029bb80910
|
Merge remote-tracking branch 'upstream/master' into syncplay
|
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 |
|
gion
|
5c8cbd4087
|
Fix code issues
|
5 years ago |
|
gion
|
8a6ec2fb71
|
Rename Syncplay to SyncPlay
|
5 years ago |
|
gion
|
6e22e9222b
|
Fix code issues
|
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 |
|
gion
|
083d3272d0
|
Refactor and other minor changes
|
5 years ago |
|
gion
|
aad5058d25
|
Implement KeepAlive for WebSockets
|
5 years ago |
|
gion
|
84d92ba9ce
|
Check that client is playing the right item
Send date when playback command is emitted
Rename some classes
|
5 years ago |
|
gion
|
f273995f5b
|
Refactor: rename user to session
|
5 years ago |
|
gion
|
10c2c62f07
|
Implement syncplay backend
|
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 |
