Commit Graph

14299 Commits

Author SHA1 Message Date
Joshua M. Boniface
53ee78170a
Merge branch 'master' into copr-fix 2019-10-27 13:52:08 -04:00
Joshua Boniface
2cdf5c203a Correct CentOS build for new Fedora spec 2019-10-27 13:51:32 -04:00
Vasily
8cf8c36708 Move throwing if cancelled after logging that fact 2019-10-27 16:48:42 +03:00
Vasily
dd7ae7747e
Apply suggestions from code review
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-10-27 16:47:00 +03:00
Bond-009
c9f4a74af0
Merge pull request #1930 from grafixeyehero/vsc-workspace
update vsc workspace launch for net core 3
2019-10-27 11:44:16 +01:00
Joshua M. Boniface
588b554ef0
Merge pull request #6 from Wuerfelbecher/copr-fix
Fix build script
2019-10-26 16:48:38 -04:00
Joshua M. Boniface
67be3f8c9e
Merge branch 'copr-fix' into copr-fix 2019-10-26 16:41:16 -04:00
Joshua M. Boniface
ee488dcb83
Merge pull request #5 from brianjmurrell/fix-copr
Fix jellyfin-web URL
2019-10-26 16:40:12 -04:00
Thomas Büttner
bf11426f7d Add comments about Source URLs and remove no longer needed dependency
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-10-26 19:24:44 +02:00
Brian J. Murrell
d5cbfee82b Fix jellyfin-web URL 2019-10-26 13:22:52 -04:00
Andrew Rabert
873225a7f2
Merge pull request #1922 from Bond-009/docker
Use the correct dotnet runtime in Docker images
2019-10-25 12:26:18 -04:00
Bond_009
f1167ace7e Use the correct dotnet runtime in Docker images
The self contained packages already contains the dotnet runtime
No need to use the dotnet runtime base image.

This should decrease the size of the image.
2019-10-25 18:04:01 +02:00
delfino434
0add74240f Translated using Weblate (Turkish)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/tr/
2019-10-24 11:14:42 -04:00
emmanuel billeaud
cb0aeeb189 Translated using Weblate (French)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr/
2019-10-24 11:14:42 -04:00
Joshua M. Boniface
f8556b3d89
Merge pull request #1918 from nvllsvm/dockermaster
Docker fixes
2019-10-24 09:14:20 -04:00
Bond-009
da7ba822b0
Merge pull request #1933 from cvium/autoreload_log_config
Reload logging.json on changes
2019-10-24 10:27:35 +02:00
Claus Vium
c3eac58dda Reload logging.json on changes 2019-10-23 19:52:12 +02:00
Anthony Lavado
5e90747541 More preparations for the tray app 2019-10-23 04:14:58 -04:00
Anthony Lavado
cfaf2b97fe Add the "service" argument to the service parameters
This will avoid an exception when the server cannot launch a browser process for the web interface.
2019-10-23 03:49:31 -04:00
Anthony Lavado
14a850b4a8 Change the default AppExit action to Exit
When the service should fail to launch Jellyfin, or should Jellyfin crash, the default action is changed from Restart to AppExit. This prevents the service from entering a constant restart due to a permissions issue or similar.
2019-10-23 03:34:12 -04:00
grafixeyehero
90c1eceec7 update vsc workspace launch for net core 3 2019-10-23 01:57:38 +03:00
grafixeyehero
752cf08e5c update persons service 2019-10-23 01:54:32 +03:00
Anthony Lavado
94932ea216 Make installer shortcut check better
During an upgrade, only create shortcuts if the existing install was not a service install. Otherwise, do not create them.
2019-10-22 04:33:06 -04:00
Anthony Lavado
a278b380b6 Fix syntax errors, move order of upgrade checks, enhance folder check, fix shortcuts
Fixes a syntax error with the NoServiceUninstall section. Moves the detection of an existing Service and datadir further up, so it happens before we decide how the installation will happen. Removed a newline from a comment, and enhanced the existing directory check. Adds an existing folder check, as well as a prompt if the user wants to continue with it or not. Also adds the datadir property to shortcuts.
2019-10-22 04:16:08 -04:00
Thomas Büttner
59995c20f1 Fix buildscript failure, remove unnecessary yarn repo for Fedora build 2019-10-21 23:42:54 +02:00
Vasily
3743137c31 Address Bond-009 review comments 2019-10-21 12:05:49 +03:00
Vasily
ae2b95024f
Update MediaBrowser.Api/Playback/BaseStreamingService.cs
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-10-21 11:58:04 +03:00
Joshua M. Boniface
91600b1c81
Merge pull request #1898 from Bond-009/jsonfix
Fix Json serialization error
2019-10-20 15:16:01 -04:00
Joshua Boniface
c30866fc93 Remove web frontend build from docker-build.sh
This is now handled in the RPM spec.
2019-10-20 11:18:12 -04:00
Joshua Boniface
d57ee0b2b8 Remove spec version bump
This will be taken care of with the 10.4.1 bump in stable.
2019-10-20 11:12:45 -04:00
Bond-009
fdb0c3a1df
Merge pull request #1909 from KerryRJ/FixDvdsFailingToPlay
Fix System.NullReferenceException when playing Dvds copied to HDD
2019-10-20 17:10:43 +02:00
Andrew Rabert
4ace99ad76 Fix Docker ffmpeg 2019-10-19 21:01:01 -04:00
Andrew Rabert
64eca9e1c7 Update Docker containers to dotnet 3.0 2019-10-19 19:36:56 -04:00
Andrew Rabert
cd3c14961f Default to jellyfin-web master 2019-10-19 19:32:19 -04:00
schbal
e3f1f62a8b Translated using Weblate (Korean)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/
2019-10-19 09:14:27 -04:00
Marius Lindvall
3f16e6d947 Translated using Weblate (Norwegian Bokmål)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nb_NO/
2019-10-18 07:14:26 -04:00
schbal
f469f18756 Translated using Weblate (Korean)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/
2019-10-18 07:14:26 -04:00
Joshua M. Boniface
e211f821c9
Merge pull request #4 from brianjmurrell/fix-copr
Support building jellyfin-web webpack
2019-10-17 09:27:13 -04:00
Brian J. Murrell
145df92265 Support buiding jellyfin-web webpack
Needs nodejs >= 8 on EL7
- from https://rpm.nodesource.com/pub_8.x/el/7/x86_64/ on EL7.
Needs yarn
- from yarnpkg.com on EL7
2019-10-17 06:22:35 -04:00
KerryJ
ef3df7baaf Fix System.NullReferenceException when playing Dvds copied to HDD 2019-10-17 11:31:11 +02:00
Vasily
6b6fede2e0 Address review comments 2019-10-16 16:13:59 +03:00
Vasily
9040ef87dc
Merge pull request #1871 from Bond-009/doc
Enable `TreatWarningsAsErrors` for MediaBrowser.Common and Emby.Photos
2019-10-16 12:40:20 +03:00
Vasily
dd83784da2
Merge pull request #1887 from joshuaboniface/bump-version
Bump version to 10.5.0 for next stable release
2019-10-16 12:40:01 +03:00
Anthony Lavado
330395e8b6 Check for the presence of AppDataLocal folder before using it 2019-10-16 03:25:39 -04:00
Anthony Lavado
6f504a246b Use the registry path for datadir, don't override it here
Removes an assumption on directory if the user has a datadir from the previous install, use that
2019-10-16 03:18:34 -04:00
Anthony Lavado
63e0bd1d61 Only create/remove shortcuts on non-service install
Should only remove shortcuts if the install type was non-service. On upgrade, check if the install type was non-service, and if so, set the variables correctly and create shortcuts.
2019-10-16 03:14:12 -04:00
Anthony Lavado
5232302532 Adds icons to shortcuts, fixes nsis warning
Adds the icon as a resource file in the program folder, and uses it for the shortcuts created.
Removes an extra section from the dialog creator file, so NSIS won't show a warning for unused code.
2019-10-16 02:29:37 -04:00
Anthony Lavado
dc46620a81 Automatically creates shortcuts for non-service installs
If the user is not installing as a service, then the installer creates a Start Menu shortcut, and a desktop shortcut. Commented out future shortcuts for a tray app.
2019-10-16 02:01:26 -04:00
Anthony Lavado
f80343bf9d Fix the Setup Type dialog titles
I had put the title and subtitle in the wrong order. This corrects the issue.
2019-10-16 01:43:53 -04:00
Bond_009
5edb8159a7 Fix Json serialization error 2019-10-15 17:49:49 +02:00