From 3e5ff42474da489c21e4f8beb6f55a26a0a02bb3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:06:29 +0200 Subject: [PATCH 1/6] - Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng ! Closes #2059 --- client/lib/popup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/lib/popup.js b/client/lib/popup.js index 0a700f826..516ce849b 100644 --- a/client/lib/popup.js +++ b/client/lib/popup.js @@ -4,9 +4,9 @@ window.Popup = new class { this.template = Template.popup; // We only want to display one popup at a time and we keep the view object - // in this `Popup._current` variable. If there is no popup currently opened + // in this `Popup.current` variable. If there is no popup currently opened // the value is `null`. - this._current = null; + this.current = null; // It's possible to open a sub-popup B from a popup A. In that case we keep // the data of popup A so we can return back to it. Every time we open a new From a2869e9d2aa052ef627ed8e125a3f8def456b700 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:10:06 +0200 Subject: [PATCH 2/6] - Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng ! Closes #2059 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 962b2176f..e95e54d2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng. + +Thanks to above GitHub users for their contributions. + # v1.91 2018-12-15 Wekan release This release fixes the following bugs: From 388c1bec451934e7ea499e6189a00b0601ac1e59 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:14:16 +0200 Subject: [PATCH 3/6] - Fix [Card scrollbar ignores mousewheel](https://github.com/wekan/wekan-scrollbar/commit/94a40da51627c6322afca50a5b1f4aa55c7ce7bf). Thanks to rinnaz and xet7 ! Closes #2058 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95e54d2e..f2e8b8552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ This release fixes the following bugs: - Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng. +- Fix [Card scrollbar ignores mousewheel](https://github.com/wekan/wekan-scrollbar/commit/94a40da51627c6322afca50a5b1f4aa55c7ce7bf). Thanks to rinnaz and xet7. Closes #2058 Thanks to above GitHub users for their contributions. From c1733fc89c4c73a1ab3f4054d0a9ebff7741a804 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:41:10 +0200 Subject: [PATCH 4/6] - Fix favicon paths for non-suburl cases. Thanks to xet7 ! Related #1692 --- client/components/main/layouts.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index e434eaba0..d0c27da52 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="/wekan-favicon.png") - link(rel="apple-touch-icon" href="/wekan-favicon.png") - link(rel="mask-icon" href="/wekan-150.svg") - link(rel="manifest" href="/wekan-manifest.json") + link(rel="shortcut icon" href="/public/wekan-favicon.png") + link(rel="apple-touch-icon" href="/public/wekan-favicon.png") + link(rel="mask-icon" href="/public/wekan-150.svg") + link(rel="manifest" href="/public/wekan-manifest.json") template(name="userFormsLayout") section.auth-layout From 3d76a35a68dc4d3236b21aec2615d21946c743dd Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:45:12 +0200 Subject: [PATCH 5/6] - Fix [favicon paths for non-suburl cases](https://github.com/wekan/wekan/commit/c1733fc89c4c73a1ab3f4054d0a9ebff7741a804). Thanks to xet7 ! Related #1692 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2e8b8552..0e054c5c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ This release fixes the following bugs: - Fix [Popup class declares member name _current but use current instead](https://github.com/wekan/wekan/issues/2059). Thanks to peishaofeng. - Fix [Card scrollbar ignores mousewheel](https://github.com/wekan/wekan-scrollbar/commit/94a40da51627c6322afca50a5b1f4aa55c7ce7bf). Thanks to rinnaz and xet7. Closes #2058 +- Fix [favicon paths for non-suburl cases](https://github.com/wekan/wekan/commit/c1733fc89c4c73a1ab3f4054d0a9ebff7741a804). Thanks to xet7. Related #1692 Thanks to above GitHub users for their contributions. From 2a59043ef18831e6d560cf8c901d25437915728d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 16 Dec 2018 11:58:44 +0200 Subject: [PATCH 6/6] v1.92 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e054c5c0..014b141f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.92 2018-12-16 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 80d6e7957..412733fa1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.91.0", + "version": "v1.92.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c9e67cb87..8050b81c2 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 = 193, + appVersion = 194, # Increment this for every release. - appMarketingVersion = (defaultText = "1.91.0~2018-12-15"), + appMarketingVersion = (defaultText = "1.92.0~2018-12-16"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,