michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,002 Commits 2 Branches 79 Tags 73 MiB
becfe018f0
Commit Graph

2954 Commits

Author SHA1 Message Date
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron
7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -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
Vasily
d21feb2b18
Merge pull request #2970 from barronpm/activitydb-efcore 
Migrate Activity Database to Entity Framework Core
 2020-05-15 22:04:23 +03:00
Frank Riley
9ee10d22c8 Rename function 2020-05-14 16:15:09 -07:00
Frank Riley
3cb6fd8a27 Fix #3083: Set the Access-Control-Allow-Origin header to the request origin/host header if possible 2020-05-14 16:15:03 -07:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
1fecd55ac0 Merge branch 'activitydb-efcore' of https://github.com/barronpm/jellyfin into activitydb-efcore 2020-05-13 15:35:44 -04:00
Patrick Barron
1e9b2613c6 Remove more unused code 2020-05-13 15:35:14 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Mark Monteiro
51cdb30741
Apply documentation suggestions from code review 
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
 2020-05-13 09:46:29 -04:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
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
 2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -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
Bond-009
62da4d0e5c
Merge pull request #2492 from Polpetta/fix-api-private-data-leak 
Fix emby/user/public API leaking sensitive data
 2020-05-07 14:52:10 +02:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Vasily
8607b6a997
Merge pull request #2817 from ferferga/master 
Remove unnecessary space in hardware decoders argument for ffmpeg
 2020-04-29 02:37:24 +03:00
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
 2020-04-26 17:37:30 -04:00
Joshua M. Boniface
00d8983d7c
Merge pull request #2990 from mark-monteiro/create-missing-folders 
Create Missing Data Folders
 2020-04-26 16:02:09 -04:00
Mark Monteiro
7615cdc963 Ensure metadata path is created on app startup, and also each time it is updated 2020-04-26 15:51:41 -04:00
Joshua M. Boniface
f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again 
Make localhost LiveTV restreams always use plain HTTP port
 2020-04-26 15:13:27 -04:00
Joshua M. Boniface
cbeeeced75
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:43 -04:00
Joshua M. Boniface
6ac723706c
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:34 -04:00
Joshua M. Boniface
0157326354
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:00 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
dkanada
97d7ffc458
Merge pull request #2861 from mark-monteiro/fix-auth-response-codes 
Fix Auth Response Codes
 2020-04-23 14:10:22 +09:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00
Bond-009
07326c1d9b
Merge branch 'master' into fix-auth-response-codes 2020-04-22 13:16:08 +02:00
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure 
Remove requirement to build web during server builds
 2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files 
This is required for SonarCloud analysis to run
 2020-04-21 16:21:09 -04:00
Mark Monteiro
f815059698 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-20 20:11:33 -04:00
Anthony Lavado
ed1dc5c922 Remove JsonIgnore from the DateLastSaved property of BaseItem 2020-04-20 02:35:47 -04:00
dkanada
3142c9b990
Merge pull request #2916 from Bond-009/minor2 
Minor improvements
 2020-04-20 13:52:27 +09:00
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19 
Fix some warnings
 2020-04-19 12:04:02 +09:00
Mark Monteiro
ecf49caf0d Add back warning message when Skia encoder cannot be used 2020-04-17 10:25:49 -04:00
Mark Monteiro
00a0e013c6 Update documentation for URL methods in ApplicationHost 2020-04-16 21:46:49 -04:00
Mark Monteiro
fee76097f4 Remove CanConnectWithHttps Property 
It is only used in one place and only adds confusion by existing
 2020-04-16 21:45:00 -04:00
Mark Monteiro
daed41815f
Add missing punctuation in xml comment 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-15 08:56:00 -04:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -04:00
Mark Monteiro
98044e7793 Document AuthenticationException correctly 2020-04-13 13:18:12 -04:00
Mark Monteiro
6d35dd6b32 Clean up SecurityException 
- Remove unused SecurityExceptionType
- Add missing constructor for InnerException
- Add missing documentation
 2020-04-13 13:13:48 -04:00
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
 2020-04-12 19:17:11 -04:00
Bond-009
84dba64644
Merge pull request #2821 from nyanmisaka/mpeg4 
Fix MPEG4 broken on VAAPI
 2020-04-12 11:44:17 +02:00