cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-20 04:18:51 -07:00
Code Issues Packages Projects Releases Wiki Activity
20,438 Commits 21 Branches 83 Tags 1.3 GiB
4deccd451e
Commit Graph

126 Commits

Author SHA1 Message Date
dkanada
158e69c6f0
Merge pull request #4935 from ConfusedPolarBear/quickconnect-cleanup 
Remove used quick connect tokens
 2021-02-08 22:54:53 +09:00
Bill Thornton
cfca27e99a Fix capitalization of Playstate message 2021-01-05 10:06:55 -05:00
Matt Montgomery
8dd83327b5 Remove quick connect tokens after usage 2021-01-02 16:37:43 -06:00
Ionut Andrei Oanca
0825ce687d Add SessionControllerConnected event 2020-12-07 01:04:48 +01: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
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 5aa519fd39.
 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
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
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
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
ConfusedPolarBear
36f3e933a2 Add quick connect 2020-04-15 14:49:20 -05:00