Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v2.55 2019-03-25 Wekan release
+
+This release fixes the following bugs, thanks to bentiss with Apache I-CLA:
+
+- [Use older api2html@0.3.0](https://github.com/wekan/wekan/commit/625682a4dab43c525494af10121edbfd547786d7)
+  to fix [broken snap and docker build](https://github.com/wekan/wekan/issues/2286),
+  because newer api2html caused
+  [breaking change](https://github.com/tobilg/api2html/commit/a9a41bca18db3f9ec61395d7262eff071a995783)
+  at api2html/bin/api2html.js:23 has error about "php": "PHP".
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.54 2019-03-25 Wekan release
 
 This release fixes the following bugs:

Dockerfile

@@ -302,7 +302,7 @@ RUN \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     \
     # extract the OpenAPI specification
-    npm install -g api2html && \
+    npm install -g api2html@0.3.0 && \
     mkdir -p /home/wekan/python && \
     chown wekan:wekan --recursive /home/wekan/python && \
     cd /home/wekan/python && \

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.54.0"
+appVersion: "v2.55.0"
 files:
   userUploads:
     - README.md

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.54.0",
+  "version": "v2.55.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 256,
+    appVersion = 257,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.54.0~2019-03-25"),
+    appMarketingVersion = (defaultText = "2.55.0~2019-03-25"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

snapcraft.yaml

@@ -113,7 +113,7 @@ parts:
             mkdir -p ./public/api
             python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml
             # we temporary need api2html and mkdirp
-            npm install -g api2html
+            npm install -g api2html@0.3.0
             npm install -g mkdirp
             api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml
             npm uninstall -g mkdirp