diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-25 19:12:48 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-25 19:12:48 +0200 |
| commit | a9e6bf62bd7be7aba5bb11122621226fd7053d69 (patch) | |
| tree | 09ead7ca734319da4c1d1fe511a76cd33017b6a5 | |
| parent | 0674ce19fe280ef21ee7089699ed18e195defebf (diff) | |
| parent | 14c493fc630c1eade00db236799ec6cf58767d85 (diff) | |
| download | wekan-a9e6bf62bd7be7aba5bb11122621226fd7053d69.tar.gz wekan-a9e6bf62bd7be7aba5bb11122621226fd7053d69.tar.bz2 wekan-a9e6bf62bd7be7aba5bb11122621226fd7053d69.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 |
6 files changed, 18 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e01068..f457bdb6 100644 --- a/CHANGELOG.md +++ b/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: @@ -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 && \ diff --git a/Stackerfile.yml b/Stackerfile.yml index 42307f5e..dcf74149 100644 --- a/Stackerfile.yml +++ b/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 diff --git a/package.json b/package.json index acf96e2e..f62ef70d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.54.0", + "version": "v2.55.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index df54bd8f..ac6d9f42 100644 --- a/sandstorm-pkgdef.capnp +++ b/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, diff --git a/snapcraft.yaml b/snapcraft.yaml index 2b4ab48b..e4b765a5 100644 --- a/snapcraft.yaml +++ b/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 |