Commit graph

91 commits

Author SHA1 Message Date
Patrick Barron 42b4f0aa2e Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2020-06-13 19:41:05 -04:00
Patrick Barron d0e2027b05 (Hopefully) fix concurrency exceptions. 2020-06-11 19:45:31 -04:00
crobibero 44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
Bond_009 4748105dce Enable TreatWarningsAsErrors for Jellyfin.Server.Implementations in Release mode 2020-05-29 11:28:19 +02:00
Patrick Barron 8ca78f33e9 Fix bug when migrating user db with users that have never logged in. 2020-05-28 14:21:26 -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
Patrick Barron 3eeb6576d8 Migrate User DB to EF Core 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
gion 029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron 9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
gion 8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
Bond_009 15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +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
Mark Monteiro 53380689ad Return correct status codes for authentication and authorization errors
- Use AuthenticatonException to return 401
- Use SecurityException to return 403
- Update existing throws to throw the correct exception for the circumstance
2020-04-13 13:17:46 -04:00
Joshua M. Boniface c356266419 Revert #2146 ordering change 2020-03-29 16:57:13 -04:00
Bond-009 0f173e1778
Merge branch 'master' into sessionmanager 2020-02-19 21:07:09 +01:00
Anthony Lavado 00073c162a
Merge pull request #2363 from dkanada/view
Add session view endpoint
2020-02-11 23:56:47 -05:00
Bond-009 cefac4f886
Update Emby.Server.Implementations/Session/SessionManager.cs
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-02-06 13:16:22 +01:00
Bond-009 0a43814596
Merge branch 'master' into sessionmanager 2020-02-06 13:04:07 +01:00
Bond-009 3fe84c3213
Apply suggestions from code review
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-02-06 13:03:02 +01:00
dkanada f93edb7ade add code suggestions 2020-02-04 01:29:18 +09:00
dkanada 1bc8ca2542 add session view endpoint 2020-02-02 00:16:11 +09:00
dkanada 26dd67a441 change authentication flow 2020-02-02 00:09:18 +09:00
dkanada 6341d986a9 fix a few warnings 2020-02-02 00:07:46 +09:00
dkanada 7df6f8d54e
update error message
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-02-01 23:14:27 +09:00
dkanada afe9ed977b improve scan progress and fix a few bugs 2020-02-01 22:44:27 +09:00
Bond-009 70bc03c795
Apply suggestions from code review
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-02-01 12:54:48 +01:00
Bond_009 c601def484 Fix warnings in SessionManager 2020-01-17 00:19:58 +01:00
Bond_009 5ca68f9623 Fix nullref exception and added logging 2020-01-13 20:06:08 +01:00
Bond_009 976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009 b8c61a5c40
Merge pull request #2146 from cromefire/patch-1
Fix invalid username handling
2019-12-15 10:07:22 +01:00
dkanada 02928128b9 track progress for any item that supports the feature 2019-12-14 11:36:06 +09:00
Cromefire_ 7e987b9642
Remove whitespace
Co-Authored-By: Claus Vium <cvium@users.noreply.github.com>
2019-12-13 15:30:08 +01:00
Cromefire_ 6231fc18ea
Fixed invalid username handling 2019-12-13 15:27:12 +01:00
Bond-009 a2c35e6dba Merge remote-tracking branch 'upstream/master' into random 2019-12-06 12:06:13 +01:00
Bond_009 fef35d0505 Add clearer exceptions, warnings and docs 2019-10-20 21:12:03 +02:00
Bond_009 bbc0875387 Don't shuffle some types by default 2019-10-20 16:08:40 +02:00
Bond_009 8d3b5c851d Improvements to UserManager 2019-08-16 21:06:11 +02:00
Bond_009 52c1b45feb Fix build 2019-08-09 23:17:54 +02:00
Bond-009 6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Bond_009 b69b19ddce Move messageId out of outer loop 2019-03-27 16:28:52 +01:00
Bond_009 6c0e2e249d Even more duplicate code removed 2019-03-27 16:13:36 +01:00
Bond_009 8ed5d154b7 Remove duplicate code 2019-03-27 16:07:08 +01:00
Bond-009 6566c91360 Seperate changes from #1023
The unrelated changes from #1023 (and more)
2019-03-25 21:27:03 +01:00
Bond-009 bf43dc00bb More warning fixes 2019-03-13 22:32:52 +01:00
Bond-009 1731bf7372 Remove ordering items 2019-02-26 20:47:23 +01:00
Claus Vium 0ef2b46106 Remove custom Threading 2019-02-05 16:47:50 +01:00
William Taylor 65cd3ed597 Replaced injections of ILogger with ILoggerFactory
This makes resolving dependencies from the container much easier as
you cannot resolve with primitives parameters in a way that is any
more readable.

The aim of this commit is to change as little as possible with the end
result, loggers that were newed up for the parent object were given the same
name. Objects that used the base or app loggers, were given a new logger with
an appropriate name.

Also removed some unused dependencies.
2019-01-20 21:05:12 +00:00