Skip to content

Commit

Permalink
Merge pull request #967 from lidarr/develop
Browse files Browse the repository at this point in the history
0.7
  • Loading branch information
Qstick committed Sep 9, 2019
2 parents 0cffd85 + 31cb5fe commit dbf8131
Show file tree
Hide file tree
Showing 4,578 changed files with 202,237 additions and 187,045 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# editorconfig.org
root = true

[*.{cs,html,js,hbs}]
[*.{cs}]
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4

[*.less]
[*.{js,html,js,hbs,less,css}]
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
9 changes: 9 additions & 0 deletions .esprintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"paths": [
"frontend/src/**/*.js"
],
"ignored": [
"**/node_modules/**/*"
],
"port": 5004
}
21 changes: 4 additions & 17 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
# Auto detect text files and perform LF normalization
*text eol=lf

# Explicitly set bash scripts to have unix endings
*.sh text eol=lf

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.sln merge=union
9 changes: 9 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: lidarr
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
custom: # Replace with a single custom sponsorship URL
40 changes: 38 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@

<!--
Before opening a new issue, please ensure:
- You use the discord for support/questions
- You search for existing bugs/feature requests
- Remove extraneous template details
-->

## Support / Questions

Provide a description of the feature request or bug, the more details the better.
Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)
Please use https://discord.gg/8Y7rDc9 for support. Support requests or questions will be redirected to discord and the issue will be closed.

<!--
Remove if not opening a bug report
-->

## Bug Report

### System Information/Logs

**Lidarr Version:**

**Operating System:**

**.net Framework (Windows) or mono (macOS/Linux) Version:**

**Link to Log Files (debug or trace):**

**Browser (for UI bugs):**

### Additional Information

<!--
Remove if not opening a feature request
-->

## Feature Request

### Description of request and what problem are you looking to solve?

### Other Information
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve

---

**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.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Logs**
Link to debug logs.

**System info (please complete the following information):**
- Lidarr Version: [e.g. 0.3.0.430]
- Operating System [e.g. iOS]
- .net Framework (Windows) or mono (macOS/Linux) Version: [e.g. 4.5 or 5.12]

**Additional context**
Add any other context about the problem here.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.

---


17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**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.
16 changes: 12 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ _dotCover*
# DevExpress CodeRush
src/.cr/

# Emacs
*~
\#*\#

# NCrunch
*.ncrunch*
.*crunch*.local.xml
Expand Down Expand Up @@ -101,7 +105,7 @@ App_Data/*.ldf
_NCrunch_*
_TeamCity*

# Sonarr
# Lidarr
config.xml
nzbdrone.log*txt
UpdateLogs/
Expand All @@ -113,15 +117,16 @@ src/UI/.idea/*
*log.txt
node_modules/
_output*
_artifacts
_rawPackage/
_dotTrace*
_tests/
*.Result.xml
coverage*.xml
coverage*.json
setup/Output/
*.~is

UI.Phantom/

#VS outout folders
bin
obj
Expand All @@ -130,8 +135,11 @@ output/*

#OS X metadata files
._*
.DS_Store

_start
_temp_*/**/*

src/.idea/
## Merge any idea folder
*/**/.idea
*.iml
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/Sonarr.iml

This file was deleted.

59 changes: 0 additions & 59 deletions .idea/codeStyleSettings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/jsLibraryMappings.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/libraries/Sonarr_node_modules.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-prefix ""
4 changes: 2 additions & 2 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sonarr Individual Contributor License Agreement #
# Lidarr Individual Contributor License Agreement #

Thank you for your interest in contributing to Sonarr ("We" or "Us").
Thank you for your interest in contributing to Lidarr ("We" or "Us").
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please complete the form below. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

## 1. Definitions ##
Expand Down
Loading

0 comments on commit dbf8131

Please sign in to comment.