Release commit (1.7)

dev/Settings/Admin/Licensing.js

@@ -52,6 +52,14 @@
 		require('Knoin/Knoin').showScreenPopup(require('View/Popup/Activate'));
 	};
 
+	/**
+	 * @returns {boolean}
+	 */
+	LicensingAdminSettings.prototype.licenseIsUnlim = function ()
+	{
+		return 1898625600 === this.licenseExpired();
+	};
+
 	/**
 	 * @returns {string}
 	 */
@@ -62,7 +70,8 @@
 			oDate = moment.unix(iTime)
 		;
 
-		return iTime && 1898625600 === iTime ? 'Never' : (oDate.format('LL') + ' (' + oDate.from(moment()) + ')');
+		return this.licenseIsUnlim() ? 'Never' :
+			(iTime && (oDate.format('LL') + ' (' + oDate.from(moment()) + ')'));
 	};
 
 	module.exports = LicensingAdminSettings;

dev/Styles/AdminBranding.less

@@ -1,7 +1,7 @@
 
 .b-admin-branding {
 	.disabled-form {
-		opacity: 0.4;
+		opacity: 0.8;
 	}
 }
 

dev/View/Admin/Settings/Pane.js

@@ -28,7 +28,6 @@
 
 		this.adminManLoadingVisibility = Data.adminManLoadingVisibility;
 		this.capa = !!Settings.settingsGet('PremType');
-		this.capa = false; // TODO
 
 		kn.constructorEnd(this);
 	}

dev/View/User/Login.js

@@ -141,6 +141,11 @@
 							else if (oData.ErrorCode)
 							{
 								this.submitRequest(false);
+								if (-1 < Utils.inArray(oData.ErrorCode, [Enums.Notification.InvalidInputArgument]))
+								{
+									oData.ErrorCode = Enums.Notification.AuthError;
+								}
+
 								this.submitError(Utils.getNotification(oData.ErrorCode));
 
 								if ('' === this.submitError())
@@ -190,7 +195,7 @@
 
 			window.open(Links.socialFacebook(), 'Facebook',
 				'left=200,top=100,width=650,height=450,menubar=no,status=no,resizable=yes,scrollbars=yes');
-				
+
 			return true;
 
 		}, function () {