lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,952 Commits 2 Branches 0 Tags 64 MiB
dcaffd3812
Commit Graph

15952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bond-009
ca2f9c7341
Merge pull request #2945 from mark-monteiro/integration-tests 
Add Integration Tests For BrandingService
 2020-05-04 19:01:02 +02:00
artiume
25651362bf
Update MimeTypes.cs 2020-05-04 12:13:50 -04:00
SaddFox
64ab8f8e7a Translated using Weblate (Slovenian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sl/
 2020-05-04 10:14:24 -04:00
x7aN
27328118a0 Translated using Weblate (Dutch) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nl/
 2020-05-04 10:14:24 -04:00
Tin Pavelic
6aca248532 Translated using Weblate (Croatian) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/hr/
 2020-05-04 10:14:24 -04:00
Anthony Lavado
0e11646107
Merge pull request #2950 from Bond-009/videoresolver 
Fix VideoResolver and tests
 2020-05-04 04:21:30 -04:00
artiume
675cbd8a16
Update MimeTypes.cs 2020-05-03 18:23:25 -04:00
Bond-009
491f59cad4
Merge pull request #3049 from mark-monteiro/fix-editorconfig 
Fix editorconfig Settings
 2020-05-03 23:45:30 +02:00
Mark Monteiro
8322d412f0 Move ruleset up one directory so it can be shared by all test projects 2020-05-03 16:51:39 -04:00
Mark Monteiro
151182b9a9 Fix settings in editorconfig file 2020-05-03 16:30:39 -04:00
Mark Monteiro
927e7a24ed Add main ruleset as a solution item so it appears in Visual Studio 2020-05-03 16:29:13 -04:00
Mark Monteiro
e66b000183 Enable StyleCop and FxCop analyzers for integration tests project 
Use a custom ruleset that derives from the base solution ruleset, overriding rules where necessary
 2020-05-03 16:23:42 -04:00
Mark Monteiro
ea82e2158c Make sure logger factories are disposed during integration tests 2020-05-03 15:31:17 -04:00
Bond-009
18075dd3e8
Merge pull request #3043 from puschie286/fix-startup-project 
Jellyfin.Server as startup project
 2020-05-03 17:26:31 +02:00
Christoph Potas
a7bc1d4341 ~ set Jellyfin.Server as startup project 
Signed-off-by: Christoph Potas <christoph286@googlemail.com>
 2020-05-03 16:13:05 +02:00
Mark Monteiro
519d65b9c8 Remove unnecessary gitignore entry 
Visual Studio no longer generates this file when opening the solution since the project SDK has been set to the correct value
 2020-05-03 01:10:51 -04:00
Mark Monteiro
1c06111497 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-05-03 01:04:19 -04:00
dkanada
2bf3dee4c4
Merge pull request #3035 from mark-monteiro/fix-repo-double-dispose 
Do not double dispose item repository resources
 2020-05-03 13:28:26 +09:00
Patrick Barron
2b41f8ab63 Clean up generated code 2020-05-02 17:56:05 -04:00
Mark Monteiro
daf79b8aeb Do not double dispose write lock and connection in user data repository 2020-05-02 15:45:03 -04:00
Davide Polonio
472efeeec4
Remove extra line in UserManager 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2020-05-02 13:09:57 +02:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
04f826e50c Fix merge errors 2020-05-02 01:09:35 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Heikki Jetsonen
62e251663f Translated using Weblate (Finnish) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fi/
 2020-05-01 16:39:46 -04:00
Bond_009
7659a2ab32 Remove ListHelper extensions 2020-05-01 16:48:33 +02:00
Aragon
9265b422f7 Translated using Weblate (Hebrew) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/he/
 2020-05-01 05:32:30 -04: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
Heikki Jetsonen
8b6bec60d3 Translated using Weblate (Finnish) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fi/
 2020-04-30 23:32:56 -04:00
fesken
c342c6b582 Translated using Weblate (Swedish) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sv/
 2020-04-30 23:32:56 -04:00
Vasily
1927d0e23c
Merge pull request #2293 from EraYaN/new-data-model 
Add new EF Core data model (v2)
 2020-04-30 12:18:51 +03:00
Erwin de Haan
bbd74f811f Spaces -> Tab in solution file 2020-04-30 10:06:02 +02:00
Erwin de Haan
a370c5c007 Restore the versioning extension settings. 2020-04-30 10:03:49 +02:00
Vasily
655a3ac54b
Merge pull request #2656 from joshuaboniface/improve-builds 
Improve builds
 2020-04-30 00:55:38 +03:00
Joshua M. Boniface
8c9604afba Add Web integration option in default service conf 2020-04-29 16:06:42 -04:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus 
Add Prometheus exporters
 2020-04-29 11:36:05 +02:00
Vasily
aff65adca9
Merge pull request #2917 from Bond-009/tests 
Improved tests
 2020-04-29 12:17:39 +03:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2 
Add some simple tests
 2020-04-29 12:17:01 +03:00
Vasily
8607b6a997
Merge pull request #2817 from ferferga/master 
Remove unnecessary space in hardware decoders argument for ffmpeg
 2020-04-29 02:37:24 +03:00
Vasily
fa46a61ee3
Merge pull request #2995 from JustAMan/fix-cache-for-real 
Now parse date in header correctly as being in UTC
 2020-04-28 01:56:39 +03:00
Łukasz Nowak
ab8a5595f6 Translated using Weblate (Polish) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/pl/
 2020-04-27 13:25:22 -04:00
Vasily
655208d375 Now parse date in header correctly as being in UTC 2020-04-27 19:03:42 +03:00
sparky8251
e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
Bond-009
cf75fc0684
Merge pull request #2992 from rotvel/feature/ffmpeg 
Try harder to find ffmpeg in app directory.
 2020-04-27 10:09:26 +02:00
Max Git
cee587d6e3 Try harder to find ffmpeg in app directory. While here do some cleanup 2020-04-27 03:25:57 +02:00
Shillos
820cd7e644 Translated using Weblate (Greek) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/el/
 2020-04-26 18:50:35 -04:00
Shillos
c38e414178 Translated using Weblate (Greek) 
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/el/
 2020-04-26 18:07:40 -04:00
Mark Monteiro
15fd4812f0 Remove unnecessary foreach loop 2020-04-26 18:04:34 -04:00
Mark Monteiro
679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config 
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
 2020-04-26 17:37:30 -04:00
Mark Monteiro
cabdec87e8 Fix merge with master 2020-04-26 16:55:00 -04:00