michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,110 Commits 2 Branches 79 Tags 73 MiB
82b0786cc6
Commit Graph

2738 Commits

Author SHA1 Message Date
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
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
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