Merge remote-tracking branch 'origin/develop' into develop

8 years ago · a460e89a8d
parent edda8786ad b1c5dd8167
commit a460e89a8d
6 changed files with 29 additions and 11 deletions
--- a/gulp/less.js
+++ b/gulp/less.js
@ -5,7 +5,7 @@ var postcss = require('gulp-postcss');
 var sourcemaps = require('gulp-sourcemaps');
 var autoprefixer = require('autoprefixer-core');
 var livereload = require('gulp-livereload');
-
+var cleancss = require('gulp-clean-css');
 var print = require('gulp-print');
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');
@ -36,12 +36,13 @@ gulp.task('less', function() {
        .pipe(sourcemaps.init())
        .pipe(less({
            dumpLineNumbers : 'false',
-            compress        : true,
-            yuicompress     : true,
+            compress        : false,
+            yuicompress     : false,
            ieCompat        : true,
            strictImports   : true
        }))
        .pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
+        .pipe(cleancss())
        .on('error', errorHandler.onError)
        .pipe(sourcemaps.write(paths.dest.content))
        .pipe(gulp.dest(paths.dest.content))
--- a/package.json
+++ b/package.json
@ -20,6 +20,7 @@
    "del": "1.2.0",
    "gulp": "3.9.0",
    "gulp-cached": "1.1.0",
+    "gulp-clean-css": "^3.0.4",
    "gulp-concat": "2.6.0",
    "gulp-declare": "0.3.0",
    "gulp-handlebars": "3.0.1",
--- a/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
+++ b/src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@ -141,7 +141,21 @@ namespace NzbDrone.Core.Configuration

        public bool LaunchBrowser => GetValueBoolean("LaunchBrowser", true);

-        public string ApiKey => GetValue("ApiKey", GenerateApiKey());
+        public string ApiKey
+        {
+            get
+            {
+                var apiKey = GetValue("ApiKey", GenerateApiKey());
+
+                if (apiKey.IsNullOrWhiteSpace())
+                {
+                    apiKey = GenerateApiKey();
+                    SetValue("ApiKey", apiKey);
+                }
+
+                return apiKey;
+            }
+        }

        public AuthenticationType AuthenticationMethod
        {
--- a/src/NzbDrone.Core/Download/TorrentClientBase.cs
+++ b/src/NzbDrone.Core/Download/TorrentClientBase.cs
@ -221,7 +221,9 @@ namespace NzbDrone.Core.Download

                var response = _httpClient.Get(request);

-                if (response.StatusCode == HttpStatusCode.SeeOther || response.StatusCode == HttpStatusCode.Found)
+                if (response.StatusCode == HttpStatusCode.MovedPermanently ||
+                    response.StatusCode == HttpStatusCode.Found ||
+                    response.StatusCode == HttpStatusCode.SeeOther)
                {
                    var locationHeader = response.Headers.GetSingleValue("Location");

@ -321,7 +323,9 @@ namespace NzbDrone.Core.Download

                var response = _httpClient.Get(request);

-                if (response.StatusCode == HttpStatusCode.SeeOther || response.StatusCode == HttpStatusCode.Found)
+                if (response.StatusCode == HttpStatusCode.MovedPermanently ||
+                    response.StatusCode == HttpStatusCode.Found ||
+                    response.StatusCode == HttpStatusCode.SeeOther)
                {
                    var locationHeader = response.Headers.GetSingleValue("Location");

--- a/src/UI/index.html
+++ b/src/UI/index.html
@ -2,7 +2,6 @@
 <html>
 <head>
    <title>Radarr</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <meta name="mobile-web-app-capable" content="yes"/>
    <meta name="apple-mobile-web-app-capable" content="yes"/>
--- a/src/UI/login.html
+++ b/src/UI/login.html
@ -2,7 +2,6 @@
 <html>
 <head>
    <title>Radarr - Login</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="mobile-web-app-capable" content="yes">
    <meta name="apple-mobile-web-app-capable" content="yes">