Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,13 @@
+# v1.92 2018-12-16 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.
+- 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.
+
 # v1.91 2018-12-15 Wekan release
 
 This release fixes the following bugs:

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

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v1.91.0",
+  "version": "v1.92.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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,