From ab7f46f827d31ea8fb7e1d47cc784a5efcb48e2a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 9 Apr 2020 01:13:27 +0200 Subject: [PATCH 1/6] Fix id, name and description --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 327a79f..b3f8754 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,10 @@ { - "name": "Wiki", - "id": "lionwikit2t", + "name": "Lionwiki", + "id": "lionwiki-t2t", "packaging_format": 1, "description": { - "en": "Lionwiki-t2t is a simple CMS (content management system) in the form of a wiki engine, based on lionwiki and the txt2tags syntax, and using flat files as database.", - "fr": "Lionwiki-t2t est un système CMS de type wiki pour la création et l'entretien collectif de sites internet, utilisant des fichiers textes comme base de données." + "en": "A lightweight wiki-style CMS using the txt2tags syntax", + "fr": "Un CMS géré sous forme de wiki utilisant la syntaxe txt2tags" }, "version": "1.0~ynh1", "url": "https://lionwiki-t2t.sourceforge.io/", From 979a27b870a31b68ba5daf3aa151f18c49875e62 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 9 Apr 2020 01:16:48 +0200 Subject: [PATCH 2/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b3f8754..e29ab81 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "packaging_format": 1, "description": { "en": "A lightweight wiki-style CMS using the txt2tags syntax", - "fr": "Un CMS géré sous forme de wiki utilisant la syntaxe txt2tags" + "fr": "Un CMS léger, géré sous forme de wiki utilisant la syntaxe txt2tags" }, "version": "1.0~ynh1", "url": "https://lionwiki-t2t.sourceforge.io/", From 8e5fe02f3705aeb55e061fd6ab4cd24f02f63d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Relland?= Date: Mon, 13 Apr 2020 11:17:02 +0200 Subject: [PATCH 3/6] Proposition de la licence MIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bonjour E. je te propose ce type de licence très populaire en ce moment : la MIT. Il suffit de faire un copie coller de la licence ici https://choosealicense.com/licenses/mit/ Amicalement, José --- LICENSE | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/LICENSE b/LICENSE index f3cff84..0a7a935 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,14 @@ File containing the license of your package. +***************************************** +José, +Proposition de licence : MIT + +https://choosealicense.com/licenses/mit/ + +A bientôt José de tricassinux.org +***************************************** + + More information here: https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- From 41c91972a497e0b957427c9407056767353ab908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Relland?= Date: Mon, 13 Apr 2020 16:08:30 +0200 Subject: [PATCH 4/6] MIT License creation --- LICENSE | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/LICENSE b/LICENSE index 0a7a935..cb97407 100644 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,23 @@ -File containing the license of your package. +MIT License -***************************************** -José, -Proposition de licence : MIT +Copyright (c) [2020] [Eric Forgeot] -https://choosealicense.com/licenses/mit/ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -A bientôt José de tricassinux.org -***************************************** +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- From b7809185de445806e64a2ba47e15d487e795612c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Relland?= Date: Mon, 13 Apr 2020 17:00:04 +0200 Subject: [PATCH 5/6] Ajout paragraphe Licence MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Précision sur la licence MIT --- README_fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 43a17e5..192a301 100644 --- a/README_fr.md +++ b/README_fr.md @@ -77,7 +77,8 @@ Si quelque chose se passe mal, vous pouvez revenir au fichier original : cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css ``` - +## Licence +Licence MIT ## Liens From 9c80c5ee240b4d819506c4b8c1d1a532f557919e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Relland?= Date: Mon, 13 Apr 2020 17:14:27 +0200 Subject: [PATCH 6/6] License chapter added MIT license mention. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ce4812..f1956e4 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,8 @@ If something goes wrong, you can go back to the original default file: ``` cp templates/minimaxing/minimaxing_org.css templates/minimaxing/minimaxing.css ``` - +## License +MIT license ## Links