diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-08-09 17:13:02 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-08-09 17:13:02 +0300 |
| commit | d509b2608f4a9f424ce1f865ba537c70d0c2b20a (patch) | |
| tree | c30c14add9bec0a1e0cd759d9459319f4216a7e6 | |
| parent | 5168fb77179a3581740f8a02e247b29dfcd1881d (diff) | |
| parent | 193af893ee4da894e9494792306f5825e99de74a (diff) | |
| download | wekan-d509b2608f4a9f424ce1f865ba537c70d0c2b20a.tar.gz wekan-d509b2608f4a9f424ce1f865ba537c70d0c2b20a.tar.bz2 wekan-d509b2608f4a9f424ce1f865ba537c70d0c2b20a.zip | |
Merge branch 'devel'
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d6727562..a8be1680 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.26 2018-08-09 Wekan release + +This release fixes the following bugs: + +- [Set WITH_API=true setting on Sandstorm, and so that export works](https://github.com/wekan/wekan/commit/a300b73d56750a1a5645767d375be60839314e84); +- [Set Matomo blank settings on Sandstorm](https://github.com/wekan/wekan/commit/acd105e61b9dca5a78354047bbc23b0a01e71d8c). + +Thanks to GitHub user xet7 for contributions. + # v1.25 2018-08-09 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 77c831da..520a197e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.25.0", + "version": "1.26.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index d9e24978..570ff46d 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 = 110, + appVersion = 111, # Increment this for every release. - appMarketingVersion = (defaultText = "1.25.0~2018-08-09"), + appMarketingVersion = (defaultText = "1.26.0~2018-08-09"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, @@ -237,6 +237,11 @@ const myCommand :Spk.Manifest.Command = ( environ = [ # Note that this defines the *entire* environment seen by your app. (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"), + (key = "WITH_API", value = "true"), + (key = "MATOMO_ADDRESS", value=""), + (key = "MATOMO_SITE_ID", value=""), + (key = "MATOMO_DO_NOT_TRACK", value="false"), + (key = "MATOMO_WITH_USERNAME", value="true"), (key = "SANDSTORM", value = "1"), (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}") ] |