From b2d582f93b4b6b826c15dd4ec90b310c018b2653 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 3 Dec 2023 22:26:50 +0100 Subject: [PATCH 1/6] Nit: warning emoji --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index b6c730b..3904313 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -17,4 +17,4 @@ More about the features can be found here: Date: Sun, 3 Dec 2023 21:27:13 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70d1051..bb22735 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ More about the features can be found here: Date: Sun, 3 Dec 2023 22:39:31 +0100 Subject: [PATCH 3/6] Fix wrong upstream license --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 082678d..cfe5a29 100644 --- a/manifest.toml +++ b/manifest.toml @@ -12,7 +12,7 @@ version = "1.1.9~ynh1" maintainers = ["fflorent"] [upstream] -license = "AGPL-3.0-only" +license = "Apache-2.0" website = "https://getgrist.com" demo = "https://docs.getgrist.com" admindoc = "https://www.getgrist.com/product/self-managed/" From f04d67b71bdc55295e0d76066b8623f0718aac2e Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 4 Dec 2023 21:58:47 +0100 Subject: [PATCH 4/6] Raise limit of 1Mb for doc uploads #12 --- conf/nginx.conf | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 27852a1..5a3192b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location @api { proxy_pass http://localhost:__PORT__; proxy_redirect off; @@ -13,6 +13,15 @@ location __PATH__/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; +} + +location / { + try_files /dev/null @api; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } + +location ~ .*/uploads$ { + try_files /dev/null @api; + client_max_body_size 10G; +} From 500ade9db5f22427c67ebcd518e6fd4619d9dc1a Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 4 Dec 2023 21:59:56 +0100 Subject: [PATCH 5/6] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index cfe5a29..6d35e61 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Grist" description.en = "Modern relational spreadsheet" description.fr = "Feuille de calcul relationnelle moderne" -version = "1.1.9~ynh1" +version = "1.1.9~ynh2" maintainers = ["fflorent"] From 114b8f31f93e9546a3029c001602d05b5590909e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Dec 2023 21:00:10 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb22735..eb785e8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ You can add some configuration in the `/home/yunohost.app/grist/custom.env` file :warning: Be sure of what you do, it may break your instance. -**Shipped version:** 1.1.9~ynh1 +**Shipped version:** 1.1.9~ynh2 **Demo:** https://docs.getgrist.com diff --git a/README_fr.md b/README_fr.md index ae7f1e9..73f794d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -38,7 +38,7 @@ Vous pouvez ajouter quelques configurations dans le fichier `/home/yunohost.app/ :warning: Soyez sûr de ce que vous faîtes, cela peut casser votre instance. -**Version incluse :** 1.1.9~ynh1 +**Version incluse :** 1.1.9~ynh2 **Démo :** https://docs.getgrist.com