cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity
17,783 Commits 19 Branches 81 Tags 1.3 GiB
1feee6f95e
Commit Graph

2305 Commits

Author SHA1 Message Date
crobibero
1feee6f95e Properly host static files and set base url 2020-09-02 08:03:15 -06:00
Bond-009
8ee042483a
Merge pull request #2888 from ConfusedPolarBear/quickconnect 
Add quick connect (login without typing password)
 2020-08-31 23:01:27 +02:00
crobibero
ec8967b8e6 Fix partial library and channel access 2020-08-27 10:00:06 -06:00
Bond-009
4f6c98b325
Merge pull request #3984 from crobibero/json-prerelease 
Use Prerelease System.Text.Json
 2020-08-26 18:59:46 +02:00
Matt Montgomery
2974a0248a Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-26 10:29:37 -05:00
crobibero
b02650ec2f use proper spdx 2020-08-26 07:39:01 -06:00
crobibero
5f60da29c7 switch to spdx 2020-08-26 07:36:57 -06:00
crobibero
670c41ee89 Properly pack project license 2020-08-25 21:33:19 -06:00
crobibero
582c016d3b bump to preview8 and remove extra references 2020-08-25 21:19:55 -06:00
Joshua M. Boniface
e83f6d6ec7
Merge pull request #3889 from Ullmie02/nuget-versioning 
Build Unstable NuGet packages
 2020-08-25 17:08:06 -04:00
Joshua M. Boniface
cf6ef9958d
Merge pull request #3910 from barronpm/event-rewrite-1 
Event Rewrite (Part 1)
 2020-08-25 16:59:35 -04:00
crobibero
5f64ab02a0 bump System.Text.Json 2020-08-25 07:33:58 -06:00
Patrick Barron
fa8892fde4 Make LibraryController.GetDownload async 2020-08-24 20:27:10 -04:00
Patrick Barron
9fa4fff15d Merge branch 'master' into event-rewrite-1 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
 2020-08-24 20:04:13 -04:00
crobibero
07e7125d07 Fix dlna play to 2020-08-21 07:24:44 -06:00
Patrick Barron
98ed90c4a2 Merge branch 'master' into event-rewrite-1 2020-08-19 18:11:17 -04:00
Bond_009
2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
Matt Montgomery
5f1a863241 Apply suggestions from code review 2020-08-17 17:13:11 -05:00
Patrick Barron
ca1f15af19 Move GenericEventArgs to Jellyfin.Data.Events 2020-08-13 20:52:55 -04:00
Patrick Barron
3ee940f7b3 Clean up GenericEventArgs 2020-08-13 19:14:03 -04:00
Patrick Barron
27139709e5 Remove ListHelper.cs 2020-08-13 17:05:55 -04:00
David
b92fbe4d69 Use VersionPrefix 2020-08-13 19:03:24 +02:00
David
a61f6e3308 Fix nuget ci 2020-08-13 15:22:12 +02:00
Matt Montgomery
4fa3d3f4f3 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-08-12 15:38:07 -05:00
Bond_009
593dbcabff Fix docs 2020-08-09 14:08:56 +02:00
Bond_009
4a4dff1973 Fix 2020-08-09 14:08:56 +02:00
crobibero
e65ecb5687 Merge remote-tracking branch 'upstream/master' into api-merge-again 2020-08-04 20:29:06 -06:00
Bond_009
2b355c36ff Minor improvements 
OFC I reduced some allocations
 2020-08-03 20:32:45 +02:00
crobibero
f915c3e5d9 Merge remote-tracking branch 'upstream/master' into api-migration 2020-08-03 11:24:13 -06:00
Bond-009
b7421db5fe
Merge pull request #3578 from barronpm/displaypreferences-efcore 
Migrate Display Preferences to EF Core
 2020-08-01 21:51:49 +02:00
Matt Montgomery
a40fe86776 Merge remote-tracking branch 'upstream/master' into quickconnect 2020-07-26 16:14:58 -05:00
Patrick Barron
a59bc5c6a8 Fixed compilation error. 2020-07-23 20:57:59 -04:00
Patrick Barron
3d69cea1c9
Merge branch 'master' into displaypreferences-efcore 2020-07-23 23:50:12 +00:00
Pika
7331c02a21
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:22:56 -04:00
Pika
ea4aa5ed8e
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:19 -04:00
Pika
262daa6650
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:13:02 -04:00
Pika
f5a3408c89
Update MediaBrowser.Model/Entities/MediaStream.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2020-07-23 19:12:52 -04:00
Pika
3b21abd879
Merge branch 'master' into more-track-titles 2020-07-23 18:59:25 -04:00
Bond-009
ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix 
Fix value parsing in Jellyfin.Api
 2020-07-23 10:37:30 +02:00
Bond-009
944fdb4c62
Merge pull request #3552 from BaronGreenback/NotificationFix 
Fixes #3551 (Notifications Serialization error)
 2020-07-23 10:34:32 +02:00
crobibero
1385064497 Merge remote-tracking branch 'upstream/master' into api-migration-merge 2020-07-20 14:28:33 -06:00
Patrick Barron
4742ddbb71 Update .NET Core to 3.1.6 2020-07-17 19:48:11 -04:00
Patrick Barron
ab396225ea Migrate Display Preferences to EF Core 2020-07-17 16:11:53 -04:00
BaronGreenback
6b4cea604c Suggested changes and removed some intellisense messages. 2020-07-17 16:19:06 +01:00
David
262e19b691 Add X-Response-Time-ms header and log slow server response time 2020-07-14 13:40:18 +02:00
BaronGreenback
12478c7196
Update NotificationOption.cs 
Fixes serialisation bug
 2020-07-13 17:54:06 +01:00
dkanada
5e706ba7ce keep playstate during syncplay group creation 2020-07-13 06:55:03 +09:00
David
ee03b919f9 Fix parsing 2020-07-12 20:11:59 +02:00
Joshua M. Boniface
f3151e7dc7
Merge pull request #3505 from Bond-009/minor3 
Minor fixes
 2020-07-05 00:30:35 -04:00
Bond_009
ae6eaa7f02 Minor fixes 2020-07-04 22:06:27 +02:00