From 4134457d53d6ccc44039c166cb8cecf4bb478161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Mon, 25 Sep 2017 23:04:59 +0200 Subject: [PATCH 1/7] Add new app Portainer --- community.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/community.json b/community.json index 56baa183..fb6c52cf 100644 --- a/community.json +++ b/community.json @@ -835,6 +835,12 @@ "state": "notworking", "url": "https://github.com/YunoHost-Apps/pluxml_ynh" }, + "Portainer": { + "branch": "master", + "revision": "702b72fbf9ae234495ae30aa36d853acd9c020d2", + "state": "inprogress", + "url": "https://github.com/aymhce/portainer_ynh" + }, "proftpd": { "branch": "master", "revision": "574d06e0ace72ffa11f3a736fd8821de773583c7", From 05218c324fdddc56b9b3d8b99d8a673ca38f1da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Mon, 25 Sep 2017 23:42:29 +0200 Subject: [PATCH 2/7] fix docker fail management --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index fb6c52cf..c9d022c7 100644 --- a/community.json +++ b/community.json @@ -837,7 +837,7 @@ }, "Portainer": { "branch": "master", - "revision": "702b72fbf9ae234495ae30aa36d853acd9c020d2", + "revision": "e2babddbac0e4b4b02c615c1a1ae65fcd8caa8a7", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" }, From 3757cf0289ae71a44e722a52316482a988d1e7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Tue, 26 Sep 2017 18:26:41 +0200 Subject: [PATCH 3/7] Update community.json --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index c9d022c7..cdfe5e01 100644 --- a/community.json +++ b/community.json @@ -837,7 +837,7 @@ }, "Portainer": { "branch": "master", - "revision": "e2babddbac0e4b4b02c615c1a1ae65fcd8caa8a7", + "revision": "01e1b281745ab531ecc22b186dc3da7102591fc7", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" }, From 27cbe1f9e987b4656aa907084048daf211675246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Thu, 28 Sep 2017 01:43:04 +0200 Subject: [PATCH 4/7] Update community.json --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index cdfe5e01..5abe6bf7 100644 --- a/community.json +++ b/community.json @@ -837,7 +837,7 @@ }, "Portainer": { "branch": "master", - "revision": "01e1b281745ab531ecc22b186dc3da7102591fc7", + "revision": "118a1dadcb38d259153bd90f0dd663d8d31111aa", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" }, From 0376a20fe2bc46f4e73e392ead467ef4c338d658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Wed, 4 Oct 2017 01:22:03 +0200 Subject: [PATCH 5/7] add recommendations --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index 5abe6bf7..c69c953a 100644 --- a/community.json +++ b/community.json @@ -837,7 +837,7 @@ }, "Portainer": { "branch": "master", - "revision": "118a1dadcb38d259153bd90f0dd663d8d31111aa", + "revision": "dc3ad0e88b3a18690ec828df95005380277332ce", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" }, From f90875aa157b7d477af89aee2538f14a0f754351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20libre?= Date: Mon, 22 Jan 2018 23:06:47 +0100 Subject: [PATCH 6/7] Update community.json --- community.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community.json b/community.json index c69c953a..8b801505 100644 --- a/community.json +++ b/community.json @@ -837,7 +837,7 @@ }, "Portainer": { "branch": "master", - "revision": "dc3ad0e88b3a18690ec828df95005380277332ce", + "revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" }, From b31d6065d243b4abe4d34df5601233347cabe51a Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Tue, 23 Jan 2018 00:19:44 +0100 Subject: [PATCH 7/7] Fix conflict --- community.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/community.json b/community.json index faebd472..10ae12aa 100644 --- a/community.json +++ b/community.json @@ -918,11 +918,12 @@ "state": "notworking", "url": "https://github.com/YunoHost-Apps/pluxml_ynh" }, - "Portainer": { + "portainer": { "branch": "master", "revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b", "state": "inprogress", "url": "https://github.com/aymhce/portainer_ynh" + }, "prestashop": { "branch": "master", "revision": "34b6f2e2f33c528a411a5c1690ad7124c68bb6da",