From 2a7aa61cd4d45528f447a9158ec06b0fbb04fc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 25 Jan 2018 21:52:24 +0100 Subject: [PATCH] Updated list of authors, copyright holders, composer and npm configuration files. --- AUTHORS | 26 ++++++-- README.md | 30 ++++++++-- behat.yml | 7 --- build.properties | 13 ---- build.xml | 118 ------------------------------------- composer.json | 5 +- continuous.yml | 6 -- package.json | 4 +- package.json.continuousphp | 20 ------- packages.json | 5 +- 10 files changed, 56 insertions(+), 178 deletions(-) delete mode 100644 behat.yml delete mode 100644 build.properties delete mode 100644 build.xml delete mode 100644 continuous.yml delete mode 100644 package.json.continuousphp diff --git a/AUTHORS b/AUTHORS index a1a2f9c..26074f5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,10 +1,28 @@ +# Developers + +Cédric Bonhomme +Jérôme Lombardi +Juan Rocha + + +# Contributors + Alexandre Dulaunoy -Benjamin Ganivet Cédric Bonhomme Cyril Rouyer -Fabien Mathey Guillaume Lesniak -Jerome De Almeida +Jérôme De Almeida +Jérôme Lombardi Juan Rocha -Pascal Paulis Thomas Metois + + +# Copyright holders + +- Copyright (C) 2016-2018 Jérôme Lombardi - https://github.com/jerolomb +- Copyright (C) 2016-2018 Juan Rocha - https://github.com/jfrocha +- Copyright (C) 2016-2018 SMILE gie securitymadein.lu +- Copyright (C) 2017-2018 Cédric Bonhomme - https://github.com/cedricbonhomme +- Copyright (C) 2016-2017 Guillaume Lesniak +- Copyright (C) 2016-2017 Thomas Metois +- Copyright (C) 2016-2017 Jérôme De Almeida diff --git a/README.md b/README.md index fed8802..72d164e 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ Skeleton Monarc Project ======================= -*Disclaimer: This is a work in progress and software is still in alpha stage.* - Introduction ------------ Skeleton Monarc Project. + Installation ------------ PHP & MySQL ----------- -Install PHP (version 7.0 recommended) with Apache (or Nginx) with extensions : xml, mbstring, mysql, zip, unzip, mcrypt, intl, imagick (extension php) +Install PHP (version 7.0 recommended) with Apache (or Nginx) with extensions: +xml, mbstring, mysql, zip, unzip, mcrypt, intl, imagick (extension php) + For Apache add mods : rewrite, ssl (a2enmod) Install MySQL (version 5.7 recommended) or MariaDb equivalent @@ -20,7 +21,8 @@ Install MySQL (version 5.7 recommended) or MariaDb equivalent Using Composer (recommended) ---------------------------- -If not already done, install composer relevant to your distribution. Then, clone the repository and manually invoke `composer`: +If not already done, install composer relevant to your distribution. Then, +clone the repository and manually invoke `composer`: cd my/project/dir git clone ssh://github.com/monarc-project/MonarcAppBO.git ./monarc @@ -202,9 +204,25 @@ Data Model monarc_common ![monarc_common](public/img/model-common.png "monarc_common") + + License ------- -This software is licensed under [GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html) +This software is licensed under +[GNU Affero General Public License version 3](http://www.gnu.org/licenses/agpl-3.0.html) -Copyright (C) 2016-2017 SMILE gie securitymadein.lu +- Copyright (C) 2016-2018 Jérôme Lombardi - https://github.com/jerolomb +- Copyright (C) 2016-2018 Juan Rocha - https://github.com/jfrocha +- Copyright (C) 2016-2018 SMILE gie securitymadein.lu +- Copyright (C) 2017-2018 Cédric Bonhomme - https://github.com/cedricbonhomme +- Copyright (C) 2016-2017 Guillaume Lesniak +- Copyright (C) 2016-2017 Thomas Metois +- Copyright (C) 2016-2017 Jérôme De Almeida + +For more information, [the list of authors and contributors](AUTHORS) is available. + +Disclaimer: This program 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 Affero General Public License for more details. diff --git a/behat.yml b/behat.yml deleted file mode 100644 index 40d672d..0000000 --- a/behat.yml +++ /dev/null @@ -1,7 +0,0 @@ -default: - autoload: - '': %paths.base%/module/MonarcCore/features/bootstrap - suites: - features: - paths: [ %paths.base%/module/MonarcCore/features ] - contexts: [ AmvContext ] diff --git a/build.properties b/build.properties deleted file mode 100644 index 272ff40..0000000 --- a/build.properties +++ /dev/null @@ -1,13 +0,0 @@ -version=0.1.0 -author.name=Pascal Paulis -author.email=pascal.paulis@continuousphp.com - -db.host=localhost -db.username=dbuser -db.password=123 -db.name.core=monarc_core -db.name.backoffice=monarc_backoffice - -dir.bin=./bin - -phinx.bin=${dir.bin}/phinx \ No newline at end of file diff --git a/build.xml b/build.xml deleted file mode 100644 index 31c9a9c..0000000 --- a/build.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DROP DATABASE IF EXISTS `${db.name}`; - - - - - - - - - - CREATE DATABASE IF NOT EXISTS ${db.name}; - GRANT USAGE ON *.* TO '${db.username}'@'%' IDENTIFIED BY '${db.password}'; - GRANT UPDATE,CREATE,REFERENCES,ALTER,LOCK TABLES,CREATE VIEW,CREATE - ROUTINE,TRIGGER,INSERT,DELETE,DROP,INDEX,CREATE TEMPORARY TABLES,EXECUTE,SHOW VIEW,ALTER ROUTINE,SELECT ON - `${db.name}`.* TO '${db.username}'@'%'; - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/composer.json b/composer.json index 058ee81..3598396 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,10 @@ {"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"}, {"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"}, {"name": "Benjamin Ganivet", "email": "benjamin@netlor.fr"}, - {"name": "Thomas Metois", "email": "thomas@netlor.fr"} + {"name": "Thomas Metois", "email": "thomas@netlor.fr"}, + {"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"}, + {"name": "Juan Rocha", "email": "juan.rocha@cases.lu"}, + {"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"} ], "require": { "php": ">=5.5", diff --git a/continuous.yml b/continuous.yml deleted file mode 100644 index 6c69a29..0000000 --- a/continuous.yml +++ /dev/null @@ -1,6 +0,0 @@ -# continuous.yml -deployment: - hooks: - AfterActivate: - - command: scripts/migrate.sh - - command: scripts/restart-server.sh \ No newline at end of file diff --git a/package.json b/package.json index e533619..61b8a1f 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "type": "git", "url": "https://github.com/monarc-project/MonarcAppBO" }, - "author": "Netlor", - "license": "Copyright", + "author": "CASES", + "license": "GNU Affero General Public License version 3", "dependencies": { "ng_anr": "https://github.com/monarc-project/ng-anr#master", "ng_backoffice": "https://github.com/monarc-project/ng-backoffice#master" diff --git a/package.json.continuousphp b/package.json.continuousphp deleted file mode 100644 index 6e426f2..0000000 --- a/package.json.continuousphp +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "MONARC", - "version": "1.0.0", - "description": "MONARC Skeleton App", - "private": true, - "repository": { - "type": "git", - "url": "https://github.com/monarc-project/skeleton.git" - }, - "author": "Netlor", - "license": "Copyright", - "dependencies": { - "ng_anr": "git+https://@github.token@:x-oauth-basic@github.com/monarc-project/ng-anr#beta", - "ng_backoffice": "git+https://@github.token@:x-oauth-basic@github.com/monarc-project/ng-backoffice#beta" - }, - "devDependencies": { - "grunt": "~0.4.1", - "grunt-cli": "~0.1.13" - } -} \ No newline at end of file diff --git a/packages.json b/packages.json index 00c3dcc..dd611d4 100644 --- a/packages.json +++ b/packages.json @@ -11,7 +11,10 @@ {"name": "Guillaume Lesniak", "email": "guillaume@netlor.fr"}, {"name": "Jerôme De Almeida", "email": "jerome.dealmeida@vesperiagroup.com"}, {"name": "Benjamin Ganivet", "email": "benjamin@netlor.fr"}, - {"name": "Thomas Metois", "email": "thomas@netlor.fr"} + {"name": "Thomas Metois", "email": "thomas@netlor.fr"}, + {"name": "Jérôme Lombardi", "email": "jerome.lombardi@cases.lu"}, + {"name": "Juan Rocha", "email": "juan.rocha@cases.lu"}, + {"name": "Cédric Bonhomme", "email": "cedric.bonhomme@cases.lu"} ], "require": { "php": ">=5.5"