diff --git a/README.md b/README.md index 81d5f7c..d3b355c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Framaforms for YunoHost [![Integration level](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) -[![Install Framaforms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=framaforms) +[![Install Framaforms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) > *This package allows you to install Framaforms quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* @@ -10,7 +10,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Framaforms is an online forms and surveys service. Registered users are allowed to create forms, share them, collect and visualize results through a simple interface. See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/) and this [interview](https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/) (in French) for further informations. -**Shipped version:** 1.0.1 +**Shipped version:** 1.0.3 ## Screenshot diff --git a/check_process b/check_process index 71c656d..91243cc 100644 --- a/check_process +++ b/check_process @@ -18,15 +18,15 @@ setup_private=1 setup_public=1 upgrade=1 + # 1.0.1+200715~ynh4 + upgrade=1 from_commit=25e97123f0e82ec1b9375774f3e86b7d8f5d73cf backup_restore=1 multi_instance=1 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email=ljf+framaforms_ynh@reflexlibre.net -Notification=down \ No newline at end of file +Notification=yes +;;; Upgrade options + ; commit=25e97123f0e82ec1b9375774f3e86b7d8f5d73cf + name=#34 from YunoHost-Apps/testing \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 85534d8..a48f4e4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://framagit.org/framasoft/framaforms/-/archive/1.0.1/framaforms-1.0.1.tar.gz -SOURCE_SUM=326eaf63a923961e3d3d2f989275b1468cb4cd2095e3874bd8dcd0817c7bd55c +SOURCE_URL=https://framagit.org/framasoft/framaforms/-/archive/1.0.3/framaforms-1.0.3.tar.gz +SOURCE_SUM=325f6735960864500d8c636cd67547666bc3aa07608b8a3c87e2e2a03ddb18cd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 861e10c..d25eb8c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -75,7 +75,7 @@ location __PATH__/ { # Handle private files through Drupal. Private file's path can come # with a language prefix. location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; + rewrite ^((/[a-z\-]+)?/system/files/(.+))$ /index.php?q=$1 last; } location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { diff --git a/issue_template.md b/issue_template.md index 4bc1631..2a9be2a 100644 --- a/issue_template.md +++ b/issue_template.md @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* diff --git a/manifest.json b/manifest.json index c7f40d6..9ebfe3d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create online webforms and surveys", "fr": "Créez des formulaires et questionnaires en ligne" }, - "version": "1.0.1+200715~ynh4", + "version": "1.0.3~ynh1", "url": "https://framagit.org/framasoft/framaforms", "license": "GPL-2.0-only", "requirements": {