Merge branch 'develop' of https://github.com/mattman86/Lidarr into develop

pull/7/head
Joseph Milazzo 8 years ago
commit 66445930eb

@ -2,4 +2,4 @@
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 http://lidarr.audio for support or other questions. (When in doubt, use the forums)

2
.gitignore vendored

@ -101,7 +101,7 @@ App_Data/*.ldf
_NCrunch_*
_TeamCity*
# Sonarr
# Lidarr
config.xml
nzbdrone.log*txt
UpdateLogs/

@ -1 +1 @@
Sonarr
Lidarr

@ -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 ##

@ -1,6 +1,6 @@
# How to Contribute #
We're always looking for people to help make Sonarr even better, there are a number of ways to contribute.
We're always looking for people to help make Lidarr even better, there are a number of ways to contribute.
## Documentation ##
Setup guides, FAQ, the more information we have on the wiki the better.
@ -15,7 +15,7 @@ Setup guides, FAQ, the more information we have on the wiki the better.
### Getting started ###
1. Fork Sonarr
1. Fork Lidarr
2. Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
3. Run `npm install`
4. Run `npm start` - Used to compile the UI components and copy them.
@ -24,8 +24,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
5. Compile in Visual Studio
### Contributing Code ###
- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Sonarr/Sonarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
- Rebase from Sonarr's develop branch, don't merge
- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/lidarr/Lidarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
- Rebase from Lidarr's develop branch, don't merge
- Make meaningful commits, or squash them
- Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
- Reach out to us on the forums or on IRC if you have any questions

@ -18,13 +18,13 @@ Lidarr is a music collection manager for Usenet and BitTorrent users. It can mon
## Feature Requests
[![Feature Requests](http://feathub.com/mattman86/Lidarr?format=svg)](http://feathub.com/mattman86/Lidarr)
[![Feature Requests](http://feathub.com/lidarr/Lidarr?format=svg)](http://feathub.com/lidarr/Lidarr)
## Configuring Development Environment:
### Requirements
* Visual Studio 2015 (https://www.visualstudio.com/vs/)
* Visual Studio 2015 or higher (https://www.visualstudio.com/vs/). The community version is free and works (https://www.visualstudio.com/downloads/).
* [Git](https://git-scm.com/downloads)
* [NodeJS](https://nodejs.org/en/download/)
@ -35,6 +35,8 @@ Lidarr is a music collection manager for Usenet and BitTorrent users. It can mon
* Grab the submodules `git submodule init && git submodule update`
* Install the required Node Packages `npm install`
* Start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
* Run the project in Visual Studio
* Open http://localhost:8686
*Please note gulp must be running at all times while you are working with Lidarr client source files.*

8
debian/control vendored

@ -2,11 +2,11 @@ Section: web
Priority: optional
Maintainer: Sonarr <contact@nzbdrone.com>
Source: nzbdrone
Homepage: https://sonarr.tv
Vcs-Git: git@github.com:Sonarr/Sonarr.git
Vcs-Browser: https://github.com/Sonarr/Sonarr
Homepage: https://lidarr.audio
Vcs-Git: git@github.com:lidarr/Lidarr.git
Vcs-Browser: https://github.com/lidarr/Lidarr
Package: nzbdrone
Architecture: all
Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
Description: Sonarr is an internet PVR
Description: Lidarr is a music collection manager

4
debian/copyright vendored

@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nzbdrone
Source: https://github.com/Sonarr/Sonarr
Source: https://github.com/lidarr/Lidarr
Files: *
Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
Copyright: 2010-2016 Lidarr <hello@lidarr.audio>
License: GPL-3.0+

@ -1,4 +1,4 @@
// will download and run sonarr (server) in a non-windows enviroment
// will download and run Lidarr (server) in a non-windows enviroment
// you can use this if you don't care about the server code and just want to work
// with the web code.
@ -31,7 +31,7 @@ function getLatest(cb) {
}
});
var url = 'http://services.sonarr.tv/v1/update/' + branch + '?os=osx';
var url = 'http://services.lidarr.audio/v1/update/' + branch + '?os=osx';
console.log('Checking for latest version:', url);

@ -1,7 +1,7 @@
{
"name": "Sonarr",
"version": "2.0.0",
"description": "Sonarr",
"name": "Lidarr",
"version": "1.0.0",
"description": "Lidarr",
"main": "main.js",
"scripts": {
"build": "gulp build",
@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "git://github.com/Sonarr/Sonarr.git"
"url": "git://github.com/lidarr/Lidarr.git"
},
"author": "",
"license": "GPL-3.0",

@ -1,10 +1,10 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define AppName "Sonarr"
#define AppPublisher "Team Sonarr"
#define AppURL "https://sonarr.tv/"
#define ForumsURL "https://forums.sonarr.tv/"
#define AppName "Lidarr"
#define AppPublisher "Team Lidarr"
#define AppURL "https://lidarr.audio/"
#define ForumsURL "https://forums.lidarr.audio/"
#define AppExeName "NzbDrone.exe"
#define BuildNumber "2.0"
#define BuildNumber GetEnv('BUILD_NUMBER')

@ -25,8 +25,8 @@
<dd>Consultation - <a href="https://github.com/galli-leo">Galli-leo</a></dd>
<dt>Feature Requests</dt>
<dd><a href="http://feathub.com/mattman86/Lidarr/">feathub.com/mattman86/Lidarr</a></dd>
<dd><a href="https://github.com/mattman86/Lidarr/issues">github.com/mattman86/Lidarr/issues</a> <b>(Please post issues on the forum first and not on github)</b></dd>
<dd><a href="http://feathub.com/lidarr/Lidarr/">feathub.com/lidarr/Lidarr</a></dd>
<dd><a href="https://github.com/lidarr/Lidarr/issues">github.com/lidarr/Lidarr/issues</a> <b>(Please post issues on the forum first and not on github)</b></dd>
</dl>
</fieldset>

Loading…
Cancel
Save