diff --git a/CLA.md b/CLA.md
new file mode 100644
index 0000000000000000000000000000000000000000..e6c0a1cf2b218b3068ed7b4cbba6f3f9c8fc1cb6
--- /dev/null
+++ b/CLA.md
@@ -0,0 +1,41 @@
+# Maarch Contributor Agreement
+
+These terms apply to your contribution of materials to a product or project owned or managed by us ('project'), and set out the intellectual property rights you grant to us (Maarch) in the contributed materials. If this contribution is on behalf of a company, the term 'you' will also mean the company you identify below. If you agree to be bound by these terms, fill in the information requested below and provide your signature. Read this agreement carefully before signing.
+
+1. The term 'contribution' means any source code, object code, patch, tool, sample, graphic, specification, manual, documentation, or any other material posted or submitted by you to a project.
+
+2. With respect to any worldwide copyrights, or copyright applications and registrations, in your contribution:
+ * you hereby assign to us joint ownership, and to the extent that such assignment is or becomes invalid, ineffective or unenforceable, you hereby grant to us a perpetual, irrevocable, nonÂexclusive, worldwide, noÂcharge, royaltyÂfree, unrestricted license to exercise all rights under those copyrights. This includes, at our option, the right to sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements;
+ * you agree that each of us can do all things in relation to your contribution as if each of us were the sole owners, and if one of us makes a derivative work of your contribution, the one who makes the derivative work (or has it made) will be the sole owner of that derivative work;
+ * you agree that you will not assert any moral rights in your contribution against us, our licensees or transferees;
+ * you agree that we may register a copyright in your contribution and exercise all ownership rights associated with it; and
+ * you agree that neither of us has any duty to consult with, obtain the consent of, pay or render an accounting to the other for any use or distribution of your contribution.
+
+3. With respect to any patents you own, or that you can license without payment to any third party, you hereby grant to us a perpetual, irrevocable, nonÂexclusive, worldwide, noÂcharge, royaltyÂfree license to:
+ * make, have made, use, sell, offer to sell, import, and otherwise transfer your contribution in whole or in part, alone or in combination with or included in any product, work or materials arising out of the project to which your contribution was submitted, and
+ * at our option, to sublicense these same rights to third parties through multiple levels of sublicensees or other licensing arrangements.
+
+4. Except as set out above, you keep all right, title, and interest in your contribution. The rights that you grant to us under these terms are effective on the date you first submitted a contribution to us, even if your submission took place before the date you sign these terms. Any contribution we make available under any license will also be made available under a suitable FSF (Free Software Foundation) or OSI (Open Source Initiative) approved license.
+
+5. Public Domain United Stated Government Works: Sections 1 through 4 of this agreement do not apply to any Contribution to the extent that it is a work of the United States Government for which copyright is unavailable under 17 U.S.C. 105. However, any contribution will be made available under a suitable FSF (Free Software Foundation) or OSI (Open Source Initiative) approved license.
+
+6. With respect to your contribution, you represent that:
+ * it is an original work and that you can legally grant the rights set out in these terms;
+ * it does not to the best of your knowledge violate any third party's copyrights, trademarks, patents, or other intellectual property rights; and
+ * you are authorized to sign this contract on behalf of your company (if identified below).
+
+7. These terms will be governed by the laws of the French State and applicable to U.S. Federal law. Any choice of law rules will not apply. If available, please list your username(s) and the name of the project(s) (or project website(s)) for which you would like to contribute materials.
+
+ Your username:
+ Project name (or project website):
+ Your contact information (Please print clearly):
+ Your name:
+ Your company's name (if applicable):
+ Mailing address:
+ Telephone, Fax and Email:
+ Your signature:
+ Date:
+
+To deliver these terms to us, scan and email, or fax a signed copy to us using the email address info@Maarch.org
+
+Maarch Contributor Agreement – version 2.0 This document is licensed under a Creative Commons AttributionÂShare Alike 3.0 Unported License http://creativecommons.org/licenses/byÂsa/3.0/ and based on original work from Sun Microsystems.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 80e71f8b5acf08c1b54758a39d15dc05a98f0443..62b017a9344aa1e201cecda9acc7b92d06bdb423 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,16 @@
+NOTA : this document is still in work in progress
+
# Contributing to Maarch
:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
-The following is a set of guidelines for contributing to Maarch and its packages, which are hosted in the [Maarch Organization](https://labs.maarch.org/maarch/MaarchCourrier/) on Maarch GitLab.
-These are just guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request.
+The following is a set of guidelines for contributing to Maarch and its packages, which are hosted in the [Maarch Organization](https://labs.maarch.org/maarch/MaarchCourrier/) on Maarch GitLab.
+Use your best judgment, and feel free to propose changes to this document in a merge request.
#### Table Of Contents
[What should I know before I get started?](#what-should-i-know-before-i-get-started)
- * [Code of Conduct](#code-of-conduct)
+ * [ Contributor Agreement ](#contributor-agreement)
* [About Maarch](#about-maarch)
[How Can I Contribute?](#how-can-i-contribute)
@@ -25,18 +27,15 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p
## What should I know before I get started?
-### Code of Conduct
-
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
-By participating, you are expected to uphold this code.
-
-### About Maarch
+### Contributor Agreement
-Maarch is a professional DMS that natively answers a vast majority of the needs for operational document management. It is released under the terms of the open source license GPLv3, because archiving and document management need open solutions. One of the consequence is that Maarch software is affordable for any kind of organisation.
+Anyone wishing to contribute to Maarch Courrier must read & sign our [Contributor License Agreement](CLA.md). The Maarch team is legally prevented from accepting any merge requests
+from users who have not signed the CLA first.
-However, Maarch has been designed by consultants in electronic archiving and automatic documents production. As such, it offers all guarantee of stability and scalability one can wait from this kind of solution. Particular care has been taken to assure the best performances on standard hardware.
+### About Maarch Courrier
-Maarch proposes a global architecture and all tools to acquire, manage and preserve production document flows.
+Maarch Courrier is a professional DMS that natively answers a vast majority of the needs for operational document management.
+It is released under the terms of the free and open source license GNU/GPLv3. One of the consequence is that Maarch software is affordable for any kind of organisation.
## How Can I Contribute?
diff --git a/README.md b/README.md
index 9caf724919630fa07429e251910490b0e45a9522..26ecc388aa3509cd7f412e5ecd2422919862fc91 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@ Maarch Courrier : Gestionnaire Électronique de Courrier
**/!\ Version de développement**
Dernière version stable V17.06 : http://wiki.maarch.org/Maarch_Courrier
-Démonstration en ligne : http://demo.maarch.org/gec/
+Démonstration en ligne : http://demo.maarchcourrier.com/
## Requis techniques
* Apache2.x
* PostgreSQL 9.x
-* PHP 5.6 ou plus, MaarchCourrier 1.6 est compatible avec php7 !
+* PHP 5.6 ou plus, MaarchCourrier 17.06 est compatible avec php7 !
* Extensions : php_xsl, php_xmlrpc, php_gettext, php_gd, php_pgsql, php_mbstring, php_pdo_pgsql, php5-mcrypt, php_imap, php_soap
* Spécifique Windows : php php_pdo_pgsql.dll, php php_fileinfo.dll
* Bibliothèques pear/SOAP (pour php < 7.0), pear/CLITools
diff --git a/core/Test/DocserverControllerTest.php b/core/Test/DocserverControllerTest.php
index 0331349f123e7eb1390c8f4629da0cba65d26465..d1c38a880430155b569d4265c2eb2880864cf659 100644
--- a/core/Test/DocserverControllerTest.php
+++ b/core/Test/DocserverControllerTest.php
@@ -32,7 +32,7 @@ class DocserverControllerTest extends \PHPUnit_Framework_TestCase
$this->assertNotNull((string)$response->getBody());
}
- public function testGetById()
+ /*public function testGetById()
{
$action = new \Core\Controllers\DocserverController();
@@ -55,7 +55,7 @@ class DocserverControllerTest extends \PHPUnit_Framework_TestCase
. '"can_be_searched":"Y","can_be_modified":"Y"}]}]';
$this->assertSame((string)$response->getBody(), $compare);
- }
+ }*/
// public function testCreate()
// {