From 456063fded9018df077434df64d9a73ef9efd1e5 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Fri, 7 Mar 2014 17:47:10 +0200 Subject: [PATCH] license and install changes --- LICENSE.txt | 12 ++++++------ install/js/install.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index a830bff330..e11546ac1a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -632,28 +632,28 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. EspoCRM - Open Source CRM - Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Alex Avramenko + Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko - This program is free software: you can redistribute it and/or modify + EspoCRM is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + EspoCRM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with EspoCRM. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - EspoCRM Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Alex Avramenko - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + EspoCRM Copyright (C) 2014 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko + EspoCRM comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/install/js/install.js b/install/js/install.js index 163414a0d2..29cd266c68 100644 --- a/install/js/install.js +++ b/install/js/install.js @@ -500,12 +500,12 @@ InstallScript.prototype.checkAjaxPermUrl = function(url) { var self = this; var urlAjax = '../'+url; - var re = $.ajax({ + var realJqXHR = $.ajax({ url: urlAjax, type: "GET", }) .always(function(data, textStatus, jqXHR){ - var status = jqXHR.status || 404; + var status = jqXHR.status || realJqXHR.status || 404; status += ''; if (status == '200' || status == '401') { var data = {'success': 1};