Explorar o código

Merge branch 'edge' into meteor-1.8

Lauri Ojansivu %!s(int64=6) %!d(string=hai) anos
pai
achega
4f4f3e4593

+ 9 - 0
CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.53 2019-03-23 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix filename and URLs](https://github.com/wekan/wekan/ccommit/994314cfa339e52a2ad124194af4e89f57ddd213).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.52 2019-03-22 Wekan release
 
 This release adds the following new features:

+ 1 - 1
Stackerfile.yml

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

+ 5 - 5
client/components/main/layouts.jade

@@ -7,10 +7,10 @@ head
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" href="/favicon.png")
-  link(rel="apple-touch-icon" href="/favicon.png")
-  link(rel="mask-icon" href="/logo-150.svg")
-  link(rel="manifest" href="/manifest.json")
+  link(rel="shortcut icon" href="/wekan-favicon.png")
+  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-logo-150.svg")
+  link(rel="manifest" href="/wekan-manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
@@ -20,7 +20,7 @@ template(name="userFormsLayout")
       br
     //else
     //  h1.at-form-landing-logo
-    //    img(src="{{pathFor '/logo.png'}}" alt="")
+    //    img(src="{{pathFor '/wekan-logo.png'}}" alt="")
     section.auth-dialog
       +Template.dynamic(template=content)
       if currentSetting.displayAuthenticationMethod

+ 1 - 1
package.json

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

BIN=BIN
public/logo.png


+ 0 - 0
public/favicon.png → public/wekan-favicon.png


+ 0 - 0
public/logo-150.png → public/wekan-logo-150.png


+ 0 - 0
public/logo-150.svg → public/wekan-logo-150.svg


+ 0 - 0
public/old-logo.png → public/wekan-logo.png


+ 0 - 0
public/manifest.json → public/wekan-manifest.json


+ 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 = 254,
+    appVersion = 255,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.52.0~2019-03-22"),
+    appMarketingVersion = (defaultText = "2.53.0~2019-03-23"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,