YunoHost-Apps/etherpad_mypads_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git synced 2024-09-03 18:36:09 +02:00
Code Issues Activity Actions

Merge pull request #157 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2021-12-09 22:43:56 +01:00 • committed by GitHub
commit db83b0f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 132 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,6 +1,12 @@
Changelog Changelog
========= =========
## [1.8.16~ynh1]() - 2021-12-09
#### Changed
* [Upgrade to 1.8.16](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/e82f22685697428a0f24b15a9682dd075d0c5223)
* [Upgrade ep_comments_page to 0.1.80](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/0395fb13763a14ad6a85967809da7473f030f58c)
## [1.8.15~ynh1]() - 2021-11-20 ## [1.8.15~ynh1]() - 2021-11-20
#### Changed #### Changed

2
README.md
View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
**Shipped version:** 1.8.15~ynh1 **Shipped version:** 1.8.16~ynh1
**Demo:** https://video.etherpad.com **Demo:** https://video.etherpad.com

2
README_fr.md
View file

@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
**Version incluse :** 1.8.15~ynh1 **Version incluse :** 1.8.16~ynh1
**Démo :** https://video.etherpad.com **Démo :** https://video.etherpad.com

1
config_panel.toml
View file

@ -1,5 +1,4 @@
version = "1.0" version = "1.0"
name = "Etherpad configuration panel"
[main] [main]
name = "Etherpad configuration" name = "Etherpad configuration"

223
manifest.json
View file

@ -1,111 +1,128 @@
{ {
"name": "Etherpad MyPads", "name": "Etherpad MyPads",
"id": "etherpad_mypads", "id": "etherpad_mypads",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Online editor providing collaborative editing in real-time", "en": "Online editor providing collaborative editing in real-time",
"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel"
}, },
"version": "1.8.15~ynh1", "version": "1.8.16~ynh1",
"url": "http://etherpad.org", "url": "http://etherpad.org",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",
"website": "http://etherpad.org", "website": "http://etherpad.org",
"demo": "https://video.etherpad.com", "demo": "https://video.etherpad.com",
"admindoc": "http://etherpad.org/doc/v1.8.15", "admindoc": "http://etherpad.org/doc/v1.8.15",
"code": "https://github.com/ether/etherpad-lite" "code": "https://github.com/ether/etherpad-lite"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {
"name": "", "name": "",
"email": "" "email": ""
}, },
"previous_maintainers": [{ "previous_maintainers": [
"name": "Maniack Crudelis", {
"email": "maniackc_dev@crudelis.fr" "name": "Maniack Crudelis",
}], "email": "maniackc_dev@crudelis.fr"
"requirements": { }
"yunohost": ">= 4.3.0" ],
}, "requirements": {
"multi_instance": true, "yunohost": ">= 4.3.0"
"services": [ },
"nginx", "multi_instance": true,
"mysql" "services": [
], "nginx",
"arguments": { "mysql"
"install" : [ ],
{ "arguments": {
"name": "domain", "install": [
"type": "domain" {
}, "name": "domain",
{ "type": "domain"
"name": "path", },
"type": "path", {
"example": "/pad", "name": "path",
"default": "/pad" "type": "path",
}, "example": "/pad",
{ "default": "/pad"
"name": "admin", },
"type": "user" {
}, "name": "admin",
{ "type": "user"
"name": "password", },
"type": "password" {
}, "name": "password",
{ "type": "password"
"name": "language", },
"type": "string", {
"ask": { "name": "language",
"en": "Choose your language", "type": "string",
"fr": "Choisissez la langue" "ask": {
}, "en": "Choose your language",
"choices" : ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"], "fr": "Choisissez la langue"
"default" : "en" },
}, "choices": [
{ "ca",
"name": "is_public", "de",
"type": "boolean", "en",
"help": { "es",
"en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.", "fr",
"fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant." "gl",
}, "hu",
"default": true "it",
}, "nl",
{ "pt"
"name": "export", ],
"type": "string", "default": "en"
"ask": { },
"en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?", {
"fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" "name": "is_public",
}, "type": "boolean",
"choices" : ["none", "abiword", "libreoffice"], "help": {
"default" : "none" "en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.",
}, "fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant."
{ },
"name": "mypads", "default": true
"type": "boolean", },
"ask": { {
"en": "Do you want to install MyPads plugin?", "name": "export",
"fr": "Voulez-vous installer le plugin MyPads ?" "type": "string",
}, "ask": {
"help": { "en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?",
"en": "<a href=https://git.framasoft.org/framasoft/ep_mypads target=_blank>MyPads plugin</a>" "fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?"
}, },
"default": true "choices": [
}, "none",
{ "abiword",
"name": "useldap", "libreoffice"
"type": "boolean", ],
"ask": { "default": "none"
"en": "Do you want to use LDAP with MyPads?", },
"fr": "Voulez-vous utiliser LDAP avec MyPads ?" {
}, "name": "mypads",
"help": { "type": "boolean",
"en": "Using LDAP won't let you add new user aside from YunoHost users.", "ask": {
"fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." "en": "Do you want to install MyPads plugin?",
}, "fr": "Voulez-vous installer le plugin MyPads ?"
"default": true },
} "help": {
] "en": "<a href=https://git.framasoft.org/framasoft/ep_mypads target=_blank>MyPads plugin</a>"
} },
"default": true
},
{
"name": "useldap",
"type": "boolean",
"ask": {
"en": "Do you want to use LDAP with MyPads?",
"fr": "Voulez-vous utiliser LDAP avec MyPads ?"
},
"help": {
"en": "Using LDAP won't let you add new user aside from YunoHost users.",
"fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost."
},
"default": true
}
]
}
} }

2
scripts/_common.sh
View file

@ -20,7 +20,7 @@ mypads_version=1.7.22
# Plugin versions # Plugin versions
ep_align_version=0.3.42 ep_align_version=0.3.42
ep_author_hover_version=0.3.28 ep_author_hover_version=0.3.28
ep_comments_page_version=0.1.79 ep_comments_page_version=0.1.80
ep_countable_version=0.0.11 ep_countable_version=0.0.11
ep_delete_empty_pads_version=0.0.7 ep_delete_empty_pads_version=0.0.7
ep_font_color_version=0.0.52 ep_font_color_version=0.0.52

11
scripts/config
View file

@ -7,10 +7,11 @@
#================================================= #=================================================
# Load common variables for all scripts. # Load common variables for all scripts.
source _variables
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
ynh_abort_if_errors
#================================================= #=================================================
# RETRIEVE ARGUMENTS # RETRIEVE ARGUMENTS
#================================================= #=================================================
@ -270,10 +271,4 @@ apply_config() {
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================
# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT ynh_app_config_run $1
#=================================================
case $1 in
show) show_config;;
apply) apply_config;;
esac