浏览代码

Merge branch 'edge' into meteor-1.8

Lauri Ojansivu 6 年之前
父节点
当前提交
9d2227bffb
共有 5 个文件被更改,包括 15 次插入5 次删除
  1. 10 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 1 1
      package.json
  4. 2 2
      sandstorm-pkgdef.capnp
  5. 1 1
      snapcraft.yaml

+ 10 - 0
CHANGELOG.md

@@ -1,3 +1,13 @@
+# v2.63 2019-04-23 Wekan release
+
+This release removes the following Caddy plugins:
+
+- [Remove Caddy plugins http.filter, http.ipfilter and http.realip from Caddy](https://github.com/wekan/wekan/commot/6a94500170509d2d82bd9a0fdc94a7ce66215b3d)
+  because they are currently broken, preventing download of Caddy during Wekan Snap build.
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.62 2019-04-23 Wekan release
 
 This release fixes the following bugs:

+ 1 - 1
Stackerfile.yml

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

+ 1 - 1
package.json

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

+ 2 - 2
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 = 264,
+    appVersion = 265,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.62.0~2019-04-23"),
+    appMarketingVersion = (defaultText = "2.63.0~2019-04-23"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

+ 1 - 1
snapcraft.yaml

@@ -225,7 +225,7 @@ parts:
 
     caddy:
         plugin: dump
-        source: https://caddyserver.com/download/linux/amd64?plugins=http.filter,http.ipfilter,http.realip&license=personal&telemetry=off
+        source: https://caddyserver.com/download/linux/amd64?license=personal&telemetry=off
         source-type: tar
         organize:
           caddy: bin/caddy