diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-03-23 21:35:55 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-03-23 21:35:55 +0200 |
commit | 4f4f3e4593acb8bf62f75ccfad6a4bd5f6ccfccc (patch) | |
tree | 1e45710a982ebe389723bf3743877401fbbae819 | |
parent | 5160d59d79fe4bd7a88e9645841ec0c6ff997d09 (diff) | |
parent | 97beed6fd11b875faf4d6ca28868fa724f456772 (diff) | |
download | wekan-4f4f3e4593acb8bf62f75ccfad6a4bd5f6ccfccc.tar.gz wekan-4f4f3e4593acb8bf62f75ccfad6a4bd5f6ccfccc.tar.bz2 wekan-4f4f3e4593acb8bf62f75ccfad6a4bd5f6ccfccc.zip |
Merge branch 'edge' into meteor-1.8
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rw-r--r-- | Stackerfile.yml | 2 | ||||
-rw-r--r-- | client/components/main/layouts.jade | 10 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | public/logo.png | bin | 10342 -> 0 bytes | |||
-rw-r--r-- | public/wekan-favicon.png (renamed from public/favicon.png) | bin | 756 -> 756 bytes | |||
-rw-r--r-- | public/wekan-logo-150.png (renamed from public/logo-150.png) | bin | 3634 -> 3634 bytes | |||
-rw-r--r-- | public/wekan-logo-150.svg (renamed from public/logo-150.svg) | 0 | ||||
-rw-r--r-- | public/wekan-logo.png (renamed from public/old-logo.png) | bin | 8433 -> 8433 bytes | |||
-rw-r--r-- | public/wekan-manifest.json (renamed from public/manifest.json) | 0 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
11 files changed, 18 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cc1307b0..9241e17e 100644 --- a/CHANGELOG.md +++ b/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: diff --git a/Stackerfile.yml b/Stackerfile.yml index 96654cca..48f2b26a 100644 --- a/Stackerfile.yml +++ b/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 diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 9908f12e..c762b321 100644 --- a/client/components/main/layouts.jade +++ b/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 diff --git a/package.json b/package.json index 6118d9ca..ac91ea71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.52.0", + "version": "v2.53.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/logo.png b/public/logo.png Binary files differdeleted file mode 100644 index b553239e..00000000 --- a/public/logo.png +++ /dev/null diff --git a/public/favicon.png b/public/wekan-favicon.png Binary files differindex 8beb85f4..8beb85f4 100644 --- a/public/favicon.png +++ b/public/wekan-favicon.png diff --git a/public/logo-150.png b/public/wekan-logo-150.png Binary files differindex e8e89c62..e8e89c62 100644 --- a/public/logo-150.png +++ b/public/wekan-logo-150.png diff --git a/public/logo-150.svg b/public/wekan-logo-150.svg index 51d4eede..51d4eede 100644 --- a/public/logo-150.svg +++ b/public/wekan-logo-150.svg diff --git a/public/old-logo.png b/public/wekan-logo.png Binary files differindex 6a2740f2..6a2740f2 100644 --- a/public/old-logo.png +++ b/public/wekan-logo.png diff --git a/public/manifest.json b/public/wekan-manifest.json index e35583c0..e35583c0 100644 --- a/public/manifest.json +++ b/public/wekan-manifest.json diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index e42893f0..46b1beec 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 = 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, |