Mister Rajoy
1b90798b90
Order ids to merge to avoid stack overflow
...
As said in https://github.com/jellyfin/jellyfin/issues/3176 , merging 1 with 2 and then 2 with 1 cause an stack overflow. sorting ids first fix the problem
2020-05-31 20:23:23 +02:00
Bond_009
7439e095e2
Merge branch 'master' into nullable3
2020-05-27 20:49:18 +02:00
dkanada
ecadde1e18
Merge pull request #3192 from jellyfin/audio
...
Fix issue with audio transcoding
2020-05-27 20:20:50 +09:00
dkanada
73d123fe36
fix issue with audio transcoding
2020-05-27 13:55:45 +09:00
Patrick Barron
31f725fdbf
Fix a bug in Emby.Notifications and clean up
2020-05-26 23:08:27 -04:00
Patrick Barron
eef7cfd912
Make SonarCloud less angry
2020-05-26 22:43:03 -04:00
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
2020-05-26 20:29:11 -04:00
Joshua M. Boniface
7c72f69189
Merge pull request #2733 from OancaAndrei/syncplay
...
Add syncplay feature
2020-05-26 20:00:01 -04:00
Joshua M. Boniface
0be3dfe7c5
Revert "Fix emby/user/public API leaking sensitive data"
2020-05-26 12:14:40 -04:00
gion
e42bfc92f3
Fix code issues
2020-05-26 11:37:52 +02:00
gion
e4838b0faa
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-26 10:23:09 +02:00
xumix
46420dfd68
Refactor copy codec checks
2020-05-26 00:58:19 +03:00
Bond_009
10e381f66f
Fix some 'bugs' flagged by sonarcloud
2020-05-25 23:52:51 +02:00
Vasily
279f0da980
Rename ImageInfo.Hash to ImageInfo.BlurHash
2020-05-26 00:52:13 +03:00
artiume
a661b37c12
Update LibraryService.cs
2020-05-22 14:40:41 -04:00
Vasily
1f83a21288
Rename Hash to BlurHash in all properties and methods for clarity
2020-05-21 01:43:19 +03:00
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
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
Vasily
a226a4ee03
Compute hash only when one is not computed in DB, small optimizations here and there
2020-05-19 14:50:14 +03:00
Vasily
02da312f8a
Fix compilation after rebase
2020-05-19 00:22:52 +03:00
Jesús Higueras
fe480caf54
Add endpoint to update all items in library
2020-05-18 23:21:38 +03:00
Jesús Higueras
b9fc0d2628
Add BlurHash support to backend
2020-05-18 23:21:37 +03: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
gion
8c04049a59
Fix some code smells
2020-05-15 20:06:41 +02:00
gion
029bb80910
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-15 18:59:35 +02:00
gion
e8f45248aa
Fix code issues
2020-05-15 18:47:16 +02: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
gion
5c8cbd4087
Fix code issues
2020-05-09 14:34:07 +02:00
gion
8a6ec2fb71
Rename Syncplay to SyncPlay
2020-05-09 12:37:39 +02:00
gion
6e22e9222b
Fix code issues
2020-05-09 12:37:23 +02: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
gion
0b974d09ca
Synchronize access to data
2020-04-28 14:12:06 +02:00
gion
083d3272d0
Refactor and other minor changes
2020-04-27 22:39:37 +02:00
gion
40889702d0
Update session ping
2020-04-27 22:39:37 +02:00
gion
6519eebabb
Implement NTP like time sync
2020-04-27 22:39:37 +02:00
gion
84d92ba9ce
Check that client is playing the right item
...
Send date when playback command is emitted
Rename some classes
2020-04-27 22:39:20 +02:00
gion
10c2c62f07
Implement syncplay backend
2020-04-27 22:07:33 +02: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
fc049caba2
Merge branch 'master' into nullable3
2020-04-15 11:09:14 +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
Patrick Barron
47ba4a84cd
Simplified more conditionals
2020-04-05 18:06:30 -04:00
Patrick Barron
81b4a4c54c
Implement various suggestions
2020-04-05 17:58:39 -04:00
Patrick Barron
e1958e3902
Miscellaneous code cleanup
2020-04-05 15:56:08 -04:00
Patrick Barron
add0a2088d
Simplified Conditionals and returns
2020-04-05 14:44:14 -04:00
Patrick Barron
80cfcf5643
Remove unnecessary casts and explicit array types
2020-04-05 13:00:35 -04:00
Patrick Barron
86c06996b1
Remove redundant name qualifiers
2020-04-05 12:48:22 -04:00
Patrick Barron
961f48f5bc
Use ? and ?? where applicable
2020-04-05 12:45:01 -04:00
Patrick Barron
6a3f9253db
Convert using statements to using declarations where applicable
2020-04-05 12:26:11 -04:00
Bond_009
30ce346f34
Enable nullabe reference types for MediaBrowser.Model
2020-04-05 18:10:56 +02:00
Patrick Barron
5966ee6d87
Convert type checks and null checks into pattern matching
2020-04-05 12:07:43 -04:00
PrplHaz4
46453549b5
Start line with Boolean
2020-04-05 07:26:21 -04:00
PrplHaz4
b05e04c0cb
Collapse IsInEnabledFolder to single expression
...
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-05 06:42:15 -04:00
Mark Monteiro
efe3ebaab8
Eliminate circular dependency between LibraryManager and ImageProcessor
2020-04-04 16:01:10 -04:00
artiume
d10ae74b38
Force Audio Transcoding for LiveTV Transcoding
...
Noticing some sync issues when transcoding livetv, the only thing I was able to do to fix it was to force the audio stream to be transcoded as well. This was how I originally wrote the code and we changed it during the review process. I am reverting it back to the original code.
2020-04-02 14:14:57 -04:00
Mark Monteiro
377f9896ce
Small fixes
2020-04-01 19:04:00 +02:00