Merge branch 'edge' into meteor-1.8

5 files changed, 58 insertions, 48 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccfec7af..e5dbd0e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,20 @@
-# Upcoming Wekan release
+# v2.61 2019-04-20 Wekan release
 
-This release adds the following updates:
+This release adds the following new features:
+
+- Admin Panel/People: Can now search users by username, full name or email and using regex to find them.
+  Display the number of users. All registered users by default else the number of users selected by the search.
+  Thanks to Akuket.
+
+and adds the following updates:
 
 - [Update to use newest GitHub flawored markdown](https://github.com/wekan/wekan/commit/fea2ad3d7d09b44c3de1dbcdd3f8750aaa6776d5),
   because [it was found old version was in use](https://github.com/wekan/wekan/issues/2334).
   Thanks to shaygover and xet7.
 - [Upgrade to Node 8.16.0](https://github.com/wekan/wekan/commit/6117097a93bfb11c8bd4c87a23c44a50e22ceb87).
-  Thanks to xet7.    
+  Thanks to Node developers and xet7.    
+- [Upgrade Docker base image to ubuntu:disco](https://github.com/wekan/wekan/commit/bd14ee3b1f450ddc6dec26ccc8da702b839942e5).
+  Thanks to Ubuntu developers and xet7.
 
 and fixes the following bugs:
 
@@ -18,6 +26,8 @@ and fixes the following bugs:
   so that in build scripts it's not needed to clone those. Also archived those wekan repos and moved issues
   to https://github.com/wekan/wekan/issues because changes and development to those packages now happends on wekan/wekan repo.
   There was also fixes to repo urls etc. Thanks to xet7.
+- [Additional updates](https://github.com/wekan/wekan/pull/2347) to meteor-1.8 branch, that contains
+  Meteor 1.8.1 version that works in Docker but not yet at Snap and Sandstorm. Thanks to justinr1234.
 
 Thanks to above GitHub users for their contributions and translators for their translations.
 
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 08d41a31..2639cb96 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.60.0"
+appVersion: "v2.61.0"
 files:
   userUploads:
     - README.md
diff --git a/package.json b/package.json
index d9974ed6..a3429ee8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.60.0",
+  "version": "v2.61.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh
index 6aa83dd3..30814c73 100755
--- a/releases/rebuild-release.sh
+++ b/releases/rebuild-release.sh
@@ -1,43 +1,43 @@
 #!/bin/bash
 
-		echo "Building Wekan."
-		cd ~/repos/wekan
-		rm -rf packages
-		mkdir -p ~/repos/wekan/packages
-		cd ~/repos/wekan/packages
-		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
-		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
-		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
-		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
-		git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
-		mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
-		mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
-
-		if [[ "$OSTYPE" == "darwin"* ]]; then
-			echo "sed at macOS";
-			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
-		else
-			echo "sed at ${OSTYPE}"
-			sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
-		fi
-
-		cd ~/repos/wekan
-		rm -rf node_modules
-		meteor npm install
-		rm -rf .build
-		meteor build .build --directory
-		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
-		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
-		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
-		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
-		#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
-		#rm -rf node_modules/bcrypt
-		#meteor npm install bcrypt
-		cd ~/repos/wekan/.build/bundle/programs/server
-		rm -rf node_modules
-		meteor npm install
-		#meteor npm install bcrypt
-		cd ~/repos
-		echo Building Wekan Done.
+echo "Building Wekan."
+cd ~/repos/wekan
+#rm -rf packages
+#mkdir -p ~/repos/wekan/packages
+#cd ~/repos/wekan/packages
+#git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+#git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+#git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+#git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+#git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+#git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+#mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+#mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+#
+#if [[ "$OSTYPE" == "darwin"* ]]; then
+#	echo "sed at macOS";
+#	sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+#else
+#	echo "sed at ${OSTYPE}"
+#	sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+#fi
+#
+cd ~/repos/wekan
+rm -rf node_modules
+meteor npm install
+rm -rf .build
+meteor build .build --directory
+cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+#rm -rf node_modules/bcrypt
+#meteor npm install bcrypt
+cd ~/repos/wekan/.build/bundle/programs/server
+rm -rf node_modules
+meteor npm install
+#meteor npm install bcrypt
+cd ~/repos
+echo Building Wekan Done.
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 99cec39e..d6e807b0 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 = 262,
+    appVersion = 263,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.60.0~2019-04-08"),
+    appMarketingVersion = (defaultText = "2.61.0~2019-04-20"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,