diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/bug_report.md | 35 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/enhancement-request.md | 20 | ||||
| -rw-r--r-- | .github/ISSUE_TEMPLATE/feature_request.md | 14 | ||||
| -rw-r--r-- | .github/pull_request_template.md | 9 | ||||
| -rw-r--r-- | CONTRIBUTORS.md | 3 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/UserManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/RemoteSearchQuery.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 19 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 22 | ||||
| -rw-r--r-- | Nuget/readme.txt | 14 |
13 files changed, 90 insertions, 58 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..4abd39cfc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a bug report +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Logs** +Please paste any log errors. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**System (please complete the following information):** + - OS: [e.g. Docker, Debian, Windows] + - Browser: [e.g. Firefox, Chrome, Safari] + - Jellyfin Version: [e.g. 10.0.1] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md new file mode 100644 index 000000000..57c0d4cae --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement-request.md @@ -0,0 +1,20 @@ +--- +name: Enhancement request +about: Suggest an modification to an existing feature +title: '' +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..a2ce07245 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,14 @@ +--- +name: Feature request +about: Suggest a new feature +title: '' +labels: feature +assignees: '' + +--- + +**Describe the feature you'd like** +A clear and concise description of what you want to happen. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..b2b3cf241 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ +Ensure your title is short, descriptive, and in the imperative mood (Fix X, Change Y, instead of Fixed X, Changed Y). +For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://jellyfin.readthedocs.io/en/latest/developer-docs/contributing/ page. + +**Changes** +Describe your changes here in 1-5 sentences. + +**Issues** +Tag any issues that this PR solves here. +Fixes # diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 80c172309..c88f4cbcd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -11,7 +11,8 @@ - [AnthonyLavado](https://github.com/anthonylavado) - [sparky8251](https://github.com/sparky8251) - [LeoVerto](https://github.com/LeoVerto) - + - [grafixeyehero](https://github.com/grafixeyehero) + # Emby Contributors - [LukePulverenti](https://github.com/LukePulverenti) diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs index 8f26dfe42..c059cbc75 100644 --- a/Emby.Server.Implementations/Library/UserManager.cs +++ b/Emby.Server.Implementations/Library/UserManager.cs @@ -885,7 +885,7 @@ namespace Emby.Server.Implementations.Library text.AppendLine("Use your web browser to visit:"); text.AppendLine(string.Empty); - text.AppendLine(localAddress + "/web/forgotpasswordpin.html"); + text.AppendLine(localAddress + "/web/index.html#!/forgotpasswordpin.html"); text.AppendLine(string.Empty); text.AppendLine("Enter the following pin code:"); text.AppendLine(string.Empty); diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index a485fa8be..af5536b36 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -3,6 +3,8 @@ <PropertyGroup> <Authors>Jellyfin Contributors</Authors> <PackageId>Jellyfin.Common</PackageId> + <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl> + <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl> </PropertyGroup> <ItemGroup> diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 3decbc42f..5898d8f98 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -3,6 +3,8 @@ <PropertyGroup> <Authors>Jellyfin Contributors</Authors> <PackageId>Jellyfin.Controller</PackageId> + <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl> + <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl> </PropertyGroup> <ItemGroup> diff --git a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs index 77cf9e255..9fe6f96bc 100644 --- a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs +++ b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs @@ -1,3 +1,5 @@ +using System; + namespace MediaBrowser.Controller.Providers { public class RemoteSearchQuery<T> @@ -5,7 +7,7 @@ namespace MediaBrowser.Controller.Providers { public T SearchInfo { get; set; } - public string ItemId { get; set; } + public Guid ItemId { get; set; } /// <summary> /// If set will only search within the given provider diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index e223f2cc8..4aacc4a49 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -3,6 +3,8 @@ <PropertyGroup> <Authors>Jellyfin Contributors</Authors> <PackageId>Jellyfin.Model</PackageId> + <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl> + <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl> </PropertyGroup> <PropertyGroup> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec deleted file mode 100644 index a3cb05bf7..000000000 --- a/Nuget/MediaBrowser.Common.nuspec +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> - <metadata> - <id>MediaBrowser.Common</id> - <version>3.0.748</version> - <title>Emby.Common</title> - <authors>Emby Team</authors> - <owners>ebr,Luke,scottisafool</owners> - <projectUrl>https://github.com/MediaBrowser/Emby</projectUrl> - <iconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Contains common model objects and interfaces used by all Emby solutions.</description> - <copyright>Copyright © Emby 2013</copyright> - </metadata> - <files> - <file src="dlls\MediaBrowser.Common.dll" target="lib\portable-net45+win8+wpa81\MediaBrowser.Common.dll" /> - <file src="dlls\MediaBrowser.Model.dll" target="lib\portable-net45+win8+wpa81\MediaBrowser.Model.dll" /> - </files> -</package> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec deleted file mode 100644 index 6c2f2d399..000000000 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> - <metadata> - <id>MediaBrowser.Server.Core</id> - <version>3.0.748</version> - <title>Emby.Server.Core</title> - <authors>Emby Team</authors> - <owners>ebr,Luke,scottisafool</owners> - <projectUrl>https://github.com/MediaBrowser/Emby</projectUrl> - <iconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</iconUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Contains core components required to build plugins for Emby Server.</description> - <copyright>Copyright © Emby 2013</copyright> - <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.748" /> - </dependencies> - </metadata> - <files> - <file src="dlls\MediaBrowser.Controller.dll" target="lib\net45\MediaBrowser.Controller.dll" /> - <file src="dlls\MediaBrowser.Controller.dll" target="lib\portable-net45+win8+wpa81\MediaBrowser.Controller.dll" /> - </files> -</package>
\ No newline at end of file diff --git a/Nuget/readme.txt b/Nuget/readme.txt deleted file mode 100644 index 3dd1cf65a..000000000 --- a/Nuget/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -To update the nuget packages, follow the below procedure: - -1. Build the solution in release mode. This will update the contents of the dll's folder -2. Open each nuspec file, and increment the versions of each, as well as each of the MB dependencies. - -For example, in MediaBrowser.Common.Internal, increment <version>, as well as <dependency id="MediaBrowser.Common" version - -This is quickest using notepad++. It can also be done with nuget package explorer. - -By keeping all the version numbers the same, it makes this largely a mindless activity. If we allow each package to have their own version, this process will be slower and prone to human error. - -3. Once this is done, publish the packages using nuget package explorer. File -> Publish. - -4. Check the nuspec files in right away, otherwise there will be merge conflicts.
\ No newline at end of file |