Commit graph

14175 commits

Author SHA1 Message Date
Joshua Boniface
76b4ba3c5e Bump version for 10.4.3 2019-12-06 15:16:22 -05:00
Joshua M. Boniface
292d4b585b Merge pull request #2104 from cvium/avoid_catastrophic_backtracking
Simplify regex to avoid catastrophic backtracking

(cherry picked from commit 6f283d80dc)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-12-06 15:16:09 -05:00
Vasily
0dd08bbbb4 Merge pull request #2071 from excelite/add_default_values_to_logconfig
add filesize limit for logfiles and a maximum logfile count

(cherry picked from commit 8f56baf6d9)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-12-06 15:15:54 -05:00
dkanada
ac8572fd2d Merge pull request #2054 from jellyfin/Bond-009-dlna-getpathvalue
dlna GetPathValue

(cherry picked from commit 5bb6e605fa)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-12-06 15:15:45 -05:00
Joshua Boniface
b300a4e8d4 Bump version for 10.4.2 2019-11-24 15:42:49 -05:00
Joshua Boniface
b3fc995977 Add bad web build branch hotfix
I hate this quick and dirty hack but it makes no sense to port to
master. This fixes a bug whereby we'd build with the master Web branch
on releases due to never checking out the right branch. This is already
obsoleted in the master branch since #1925 already replaces this entire
process for Debuntu builds, and others should be fixed with a more
robust solution. That said, for the 10.4.z release chain, this
ultra-quick solution fixes the problem without changing much.
2019-11-24 15:42:43 -05:00
Joshua Boniface
7f5a070406 Restore MediaBrowser.Model.Extensions after #2008
Removing this caused lines 270-271 to fail as the function override did
not exist in the .NET 2.2 framework. Restores functionality.
2019-11-24 14:59:11 -05:00
Joshua M. Boniface
7ccef6068b Merge pull request #2045 from Bond-009/baseurlfix2
Fix baseurl issues part 2

(cherry picked from commit db581c4d9b)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:43:15 -05:00
dkanada
06aac98996 Merge pull request #2039 from Bond-009/fixcondition
Fix always false condition

(cherry picked from commit 47ad21b6e3)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:42:17 -05:00
Vasily
0f18482ba6 Merge pull request #2034 from Bond-009/easypass
Fix easy password

(cherry picked from commit 13dd63d631)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:41:03 -05:00
Vasily
ffd7835ab5 Merge pull request #2019 from Bond-009/baseurlhotfix
Remove leading / from baseurl

(cherry picked from commit 0836241e90)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:39:49 -05:00
dkanada
fb6b103164 Merge pull request #2008 from Bond-009/pathvalue
Fix GetPathValue function

(cherry picked from commit c87f459ec2)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:39:11 -05:00
Joshua M. Boniface
2de763eef9 Merge pull request #1992 from Bond-009/namingtests
Fix naming tests

(cherry picked from commit 78e0afae2f)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:37:23 -05:00
dkanada
46ab046c34 Merge pull request #1929 from Narfinger/parser-fix4
[Draft][Help wanted] Fix parsing of certain names and adds a default season if no season was found

(cherry picked from commit 61b9b4046a)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-24 13:32:23 -05:00
Joshua Boniface
cf54a0e8be Fix missed backport change
This stupid file is back; looks like its location changed in .NET 3.0
versus .NET 2.2. Just revert it back to its original location.

Related to #1859
2019-11-03 14:50:03 -05:00
Joshua Boniface
e73cf46e14 Bump version to 10.4.1 2019-11-03 14:45:56 -05:00
dkanada
39c3b2f044 Merge pull request #1954 from LogicalPhallacy/LogicalPhallacy-patch-NSSM
Use mirror for NSSM

(cherry picked from commit ef623f5129)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-03 14:45:20 -05:00
Joshua M. Boniface
7a592a0f15 Merge pull request #1904 from JustAMan/hls-move-2
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg

(cherry picked from commit a460814182)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-03 14:45:07 -05:00
Joshua M. Boniface
1fad64cd59 Merge pull request #1903 from anthonylavado/nsis-update
Update NSIS Installer

(cherry picked from commit 9756bdb76e)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-03 14:44:57 -05:00
Joshua M. Boniface
86e5dc4607 Merge pull request #1859 from joshuaboniface/copr-fix
Fix COPR build and Fedora packaging

(cherry picked from commit 5d5fa55fe5)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-11-03 14:40:10 -05:00
Bond-009
e98e4766f7 Merge pull request #1933 from cvium/autoreload_log_config
Reload logging.json on changes

(cherry picked from commit da7ba822b0)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-24 09:38:42 -04:00
Joshua M. Boniface
6e59671cf6 Merge pull request #1898 from Bond-009/jsonfix
Fix Json serialization error

(cherry picked from commit 91600b1c81)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 15:17:39 -04:00
Bond-009
86a50367b2 Merge pull request #1909 from KerryRJ/FixDvdsFailingToPlay
Fix System.NullReferenceException when playing Dvds copied to HDD

(cherry picked from commit fdb0c3a1df)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:22:13 -04:00
Bond-009
0212c0b85f Merge pull request #1870 from JustAMan/fix-http-ex1
Fix exception when handling error, log errors better

(cherry picked from commit d8d2e52e3f)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:21:54 -04:00
Vasily
89d365122c Merge pull request #1866 from Bond-009/sqlslow
Change slow query time logging to debug

(cherry picked from commit cadfd5bf3f)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:21:41 -04:00
Vasily
9c0a8350d6 Merge pull request #1863 from joshuaboniface/fix-baseurl-issues
Fix inconsistent BaseUrl behavior

(cherry picked from commit 1176749f14)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:21:26 -04:00
Vasily
818d21718c Merge pull request #1862 from joshuaboniface/bump-version
Fix bump_version for submodule removal

(cherry picked from commit aa9d7d7f04)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:21:06 -04:00
Vasily
0b551c0cd4 Merge pull request #1861 from joshuaboniface/fix-centos-build
Use NVM to install nodejs v8 and yarn for CentOS

(cherry picked from commit 094852ce30)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2019-10-20 14:20:41 -04:00
Joshua M. Boniface
d8c3b26fa6
Merge pull request #1846 from jellyfin/EraYaN-patch-1
Switch to custom patched build for ffmpeg for the Windows installer
2019-10-06 19:23:01 -04:00
Erwin de Haan
adde41c533
Remove /bin from ffmpeg path. 2019-10-06 22:26:17 +02:00
Erwin de Haan
3925e1dced
Fix extracted path from ffmpeg zip. 2019-10-06 22:20:49 +02:00
Erwin de Haan
c7d1206dcb
Switch to custom patched build for ffmpeg 2019-10-06 22:03:44 +02:00
Vasily
f1567c64a5
Merge pull request #1844 from dkanada/poster
Fix missing image on seasons without posters
2019-10-06 22:16:21 +03:00
Joshua M. Boniface
d900cc5c53
Merge pull request #1845 from joshuaboniface/mesa-va-drivers-fix
Correct missing mesa-va-drivers package
2019-10-06 15:12:48 -04:00
Poki
5c456231b1 Translated using Weblate (Finnish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fi/
2019-10-06 09:14:04 -04:00
Joshua Boniface
abde7c0242 Make the comment nicer 2019-10-05 18:38:55 -04:00
Joshua Boniface
762d17c3df Move copy steps further so they're not overwriting 2019-10-05 18:24:38 -04:00
dkanada
e006b7f1e1 add comment explaining a bug fix 2019-10-06 01:24:04 +09:00
dkanada
db10f380d1 fix missing image on seasons without posters 2019-10-06 00:58:27 +09:00
Poki
60f8aa540f Added translation using Weblate (Finnish) 2019-10-05 08:04:16 -04:00
Joshua M. Boniface
7b64c696f7
Merge pull request #1841 from joshuaboniface/docs-url
Update Docs to docs.jellyfin.org URL
2019-10-04 15:13:07 -04:00
Joshua Boniface
0367dc21f8 Update GitHub templates 2019-10-04 15:07:59 -04:00
Joshua Boniface
7a172a9051 Update Docs to docs.jellyfin.org URL 2019-10-04 14:37:36 -04:00
Joshua M. Boniface
5bb44c36e1
Merge pull request #1822 from anthonylavado/readme-fix
Update README for new docs location
2019-10-04 13:24:17 -04:00
Bond-009
3ad34de808
Update ApplicationHost.cs 2019-10-04 18:53:26 +02:00
Joo-Hong Lee
4025b2c6a1 Translated using Weblate (Korean)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/
2019-10-04 00:13:59 -04:00
Joshua M. Boniface
6b00cc1a06
Merge pull request #1829 from thornbill/fix-sd-auth
Fix SchedulesDirect authentication
2019-10-02 12:36:25 -04:00
Bill Thornton
80dccdef22 Add using block and HexHelper 2019-10-02 09:51:53 -04:00
SaddFox
b0ec5c527d Translated using Weblate (Slovenian)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sl/
2019-10-02 02:13:58 -04:00
Kamilake
5d073713b6 Translated using Weblate (Korean)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/
2019-10-02 02:13:58 -04:00