Commit Graph

2717 Commits

Author SHA1 Message Date
Patrick Barron
1d1a145ad4 Fix issues and add profile image support 2020-05-20 10:04:00 -04:00
Patrick Barron
d35a7ba8bd Fix more issues 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
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
Patrick Barron
dcaffd3812 Fix regressions introduced by #3098 2020-05-14 20:11:34 -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
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -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
Patrick Barron
62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00: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
dkanada
c15463fa12
Merge pull request #2837 from Bond-009/async2
Minor IAsyncDisposable improvements
2020-05-06 20:30:03 +09:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond-009
7f7a686ea6
Merge pull request #2573 from YouKnowBlom/add-hls-fields
Add codecs, resolution and frame-rate fields to HLS master playlist
2020-05-01 11:20:56 +02:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2
Add some simple tests
2020-04-29 12:17:01 +03:00
Andreas B
153ea9f027 Fix error in HLS codecs field when level is null 2020-04-25 15:22:09 +02: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
Vasily
07143bcb68
Merge pull request #2466 from dkanada/plugin
Update plugin classes for nightly builds
2020-04-21 01:45:52 +03:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
dkanada
3142c9b990
Merge pull request #2916 from Bond-009/minor2
Minor improvements
2020-04-20 13:52:27 +09:00
Joshua M. Boniface
5c669d7ad7
Merge pull request #2849 from lyonzy/patch-1
Handle null outputFileExtension in GetOutputFilePath
2020-04-19 12:45:08 -04:00
Bond_009
a73e1f18b6 Minor improvements 2020-04-19 11:16:09 +02:00
Matt Lyons
e7fde6aaca
Handle null outputFileExtension with null-conditional operator 2020-04-17 16:13:56 +10:00
Bond-009
31769bda28
Merge pull request #2745 from Artiume/patch-6
Force Audio Transcoding for LiveTV Transcoding
2020-04-15 23:23:56 +02:00
Bond_009
38dae51ccf Minor IAsyncDisposable improvements 2020-04-15 11:05:32 +02:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -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
dkanada
cb2523e2ef merge branch master into plugin 2020-04-13 14:38:19 +09:00
Matt Lyons
b52199e9e2
Handle null outputFileExtension in GetOutputFilePath 2020-04-13 12:44:15 +10:00
Vasily
6386b9b1b9
Merge pull request #2782 from JustAMan/fix-ssa-delivery
Fix support for attachments with baseURL set
2020-04-12 23:37:34 +03:00
Bond-009
14674d4469
Merge pull request #2772 from barronpm/codecleanup
MediaBrowser.Api code cleanup
2020-04-11 19:30:23 +02:00
Mark Monteiro
1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
dkanada
bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada
8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09:00
Vasily
5b59cd2eb2
Merge pull request #2696 from mark-monteiro/fix-extras
Display Extras With Unknown Types
2020-04-07 23:39:31 +03:00
Bond-009
3a98ad8255
Merge pull request #2721 from PrplHaz4/patch-2
Separate Channels permissions from All Libraries
2020-04-07 19:10:34 +02:00
Patrick Barron
555651aae2 Fixed indentation and corrected typo 2020-04-06 23:17:49 -04:00
Vasily
5be60782ed Fix support for attachments with baseURL set
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
2020-04-06 14:06:42 +03:00
Patrick Barron
c9da49ebaa Implemented more suggestions 2020-04-05 23:12:25 -04:00