dkanada
a486cd27a9
Merge pull request #4935 from ConfusedPolarBear/quickconnect-cleanup
...
Remove used quick connect tokens
(cherry picked from commit 158e69c6f0efafd5157e39e7c2de80919090cec2)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2021-02-21 13:29:02 -05:00
Bond-009
d9a9a23a3c
Merge pull request #4962 from thornbill/fix-playstate-name
...
Fix capitalization of Playstate message
(cherry picked from commit 07650d91dafbd55c3b4b7d29b01d47c2cde29712)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2021-01-23 15:37:25 -05:00
Claus Vium
e70a6d41f4
Merge pull request #4710 from OancaAndrei/syncplay-fix-session-restore
...
Restore sessions in SyncPlay groups upon reconnection
(cherry picked from commit a57e465de9c34c15fb6981b752bb5ad4121a2ab5)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
2020-12-13 20:34:32 -05:00
cvium
65e6211c03
Remove circular dependency between websocket listeners and manager
2020-11-28 11:21:53 +01:00
cvium
1a0d8aef80
Revert "Removed Lazy implementation."
2020-11-28 09:50:16 +01:00
Greenback
5cd5a7d4ce
Removed Lazy implementation.
2020-11-28 00:25:20 +00:00
Joshua M. Boniface
c98c2ab955
Merge branch 'master' into syncplay-enhanced
2020-11-27 09:46:18 -05:00
Patrick Barron
5790db05ba
Clean up DeviceManager and don't store capabilities on disk
2020-11-19 09:38:54 -05:00
crobibero
73d2cb1c2a
Updated based on review feedback
2020-11-13 18:04:06 -07:00
crobibero
95ebb9a55a
Use null coalescing when possible
2020-11-13 11:24:46 -07:00
crobibero
5f52a58e78
Convert NullReferenceException to ResourceNotFoundException
2020-11-13 11:14:44 -07:00
crobibero
7bf320922c
Fix nullability errors in Emby.Server.Implementations
2020-11-13 09:41:18 -07:00
Ionut Andrei Oanca
8819a9d478
Add playlist-sync and group-wait to SyncPlay
2020-10-16 12:06:29 +02:00
cvium
3d69bcd190
Fix playbackstart not triggering in the new eventmanager
2020-10-06 08:14:56 +02:00
Bond-009
e011659186
Merge pull request #4210 from nielsvanvelzen/typed-websocket-message
...
Use enum for WebSocket message types
2020-10-05 10:40:52 +02:00
Joshua M. Boniface
67e89dd525
Use nicer count comparitor
2020-10-04 17:00:13 -04:00
Joshua M. Boniface
df177b4752
Revert "Implement better count method"
...
This reverts commit 5aa519fd399d8b09a360f6448acc992225f8c219.
2020-10-04 15:52:39 -04:00
Joshua M. Boniface
5aa519fd39
Implement better count method
2020-10-04 15:46:57 -04:00
Joshua M. Boniface
8dfa2015d0
Make the count an int for cleanliness
2020-10-04 14:14:42 -04:00
Joshua M. Boniface
d0ec6872f3
Increase count check to 1
...
There's another way to disable a user anyways.
2020-10-04 14:06:20 -04:00
Joshua M. Boniface
6e1d1eed23
Make log entry informational
2020-10-04 13:30:21 -04:00
Joshua M. Boniface
b130af1b0c
Remove variables from SecurityException
2020-10-04 13:29:18 -04:00
Joshua M. Boniface
975fca5158
Fix syntax error
2020-10-04 13:19:56 -04:00
Joshua M. Boniface
5a7dda337f
Add active session tracking
...
Adds a flag for a maximum number of user sessions, as well as an
authentication check to ensure that the user is not above this level.
2020-10-04 13:02:54 -04:00
Niels van Velzen
72534f9d66
Use SessionMessageType for WebSocket messages
2020-09-27 10:00:20 +02:00
Niels van Velzen
3459655bb4
Use GeneralCommandType enum in GeneralCommand name
2020-09-21 16:56:22 +02:00
Claus Vium
571d0570f5
Kill HttpListenerHost
2020-09-03 11:32:22 +02:00
Matt Montgomery
2974a0248a
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-08-26 10:29:37 -05:00
Matt Montgomery
5f1a863241
Apply suggestions from code review
2020-08-17 17:13:11 -05:00
Patrick Barron
adabb4b842
Use IEventManager in SessionManager
2020-08-15 15:55:31 -04:00
Patrick Barron
ca1f15af19
Move GenericEventArgs to Jellyfin.Data.Events
2020-08-13 20:52:55 -04:00
Matt Montgomery
4fa3d3f4f3
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-08-12 15:38:07 -05:00
Matt Montgomery
a40fe86776
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-07-26 16:14:58 -05:00
Bond_009
01e781035f
Fix warnings
2020-07-24 16:37:54 +02:00
Patrick Barron
3cca8db905
Fix log spam from EF Core
2020-07-07 18:20:17 -04:00
crobibero
ef8bec23c4
revert missing session fields
2020-06-24 15:09:15 -06:00
ConfusedPolarBear
e2f16fc255
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-06-19 23:33:43 -05:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516
2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629)
2020-06-16 10:37:52 +12:00
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
ConfusedPolarBear
7d9b552403
Apply suggestions from code review
...
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-06-09 13:28:40 -05:00
ConfusedPolarBear
35ff2be9d7
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-06-08 14:43:58 -05: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
ConfusedPolarBear
5d281adedd
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-05-29 17:42:42 -05: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
