From ce3fd5d19cdd1d546fdba9935b1a3a00770ab6a6 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Fri, 31 Jul 2015 18:29:15 +0200 Subject: [PATCH] Fixed copyright notice - fixed copyright place inside HTML file in order to keep encoding information in the first 1024 bytes - updated licence notice to AGPL --- frontend/delta/html/index_template.html | 7 +++---- frontend/delta/properties/creditsAndCopyrights.txt | 5 ++--- properties/license.txt | 3 ++- scripts/builder/frontendBuilder.py | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frontend/delta/html/index_template.html b/frontend/delta/html/index_template.html index 87e8f1d..46da622 100644 --- a/frontend/delta/html/index_template.html +++ b/frontend/delta/html/index_template.html @@ -1,12 +1,11 @@ - Clipperz - keep it to yourself + - diff --git a/frontend/delta/properties/creditsAndCopyrights.txt b/frontend/delta/properties/creditsAndCopyrights.txt index c7cf622..7cddcee 100644 --- a/frontend/delta/properties/creditsAndCopyrights.txt +++ b/frontend/delta/properties/creditsAndCopyrights.txt @@ -1,6 +1,6 @@ @clipperz.license@ - ==> This application is build using also the following libraries +==> This application is build using also the following libraries # MochiKit (http://www.mochikit.com) * Repository: @mochikit.repository@ (version: @mochikit.version@ - commit: @mochikit.commit@) @@ -62,5 +62,4 @@ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet * License: http://opensource.org/licenses/BSD-3-Clause -=============================================================================== - +=============================================================================== \ No newline at end of file diff --git a/properties/license.txt b/properties/license.txt index 7fff14f..3860fee 100644 --- a/properties/license.txt +++ b/properties/license.txt @@ -1,3 +1,4 @@ + GNU AFFERO GENERAL PUBLIC LICENSE Copyright 2008-2015 Clipperz Srl @@ -29,4 +30,4 @@ For further information about Clipperz: https://clipperz.is this application refer to this page: -=============================================================================== +=============================================================================== \ No newline at end of file diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index ad39a81..22f7c1a 100755 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py @@ -314,7 +314,7 @@ class FrontendBuilder(object): if not self.processedFiles.has_key(processedFile): #self.log("assembling copyright header") copyrightValues = self.settings['copyright.values'] - license = self.loadFilesContent('../../properties', ['license.txt']) + license = self.loadFilesContent('../../properties', ['license.AGPL.txt']) result = self.loadFilesContent('properties', ['creditsAndCopyrights.txt']) result = re.sub('@clipperz.license@', license, result)