Merge branch 'edge' into meteor-1.8

4 files changed, 27 insertions, 25 deletions

diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh
index ce3d445d..6aa83dd3 100755
--- a/releases/rebuild-release.sh
+++ b/releases/rebuild-release.sh
@@ -5,14 +5,15 @@
 		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
-                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
-                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+		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";
diff --git a/releases/rebuild-wekan.sh b/releases/rebuild-wekan.sh
index bee5a228..2f3e3eeb 100755
--- a/releases/rebuild-wekan.sh
+++ b/releases/rebuild-wekan.sh
@@ -95,6 +95,7 @@ do
 		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
                 rm -rf meteor-accounts-oidc
diff --git a/releases/virtualbox/rebuild-wekan.sh b/releases/virtualbox/rebuild-wekan.sh
index 546e9d1e..c1adaf78 100755
--- a/releases/virtualbox/rebuild-wekan.sh
+++ b/releases/virtualbox/rebuild-wekan.sh
@@ -4,8 +4,6 @@ echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally
 echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
 echo "      You can still use any other locale as your main locale."
 
-#X64NODE="https://nodejs.org/dist/v8.14.1/node-v8.14.1-linux-x64.tar.gz"
-
 function pause(){
 	read -p "$*"
 }
@@ -64,17 +62,19 @@ do
         "Build Wekan")
 		echo "Building Wekan."
 		cd ~/repos/wekan
-		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
-                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
-                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
-                rm -rf meteor-accounts-oidc
+		## REPOS BELOW ARE INCLUDED TO WEKAN
+		#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
+                #rm -rf meteor-accounts-oidc
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh
index 77fbdd54..14a86dc3 100755
--- a/releases/virtualbox/start-wekan.sh
+++ b/releases/virtualbox/start-wekan.sh
@@ -270,10 +270,10 @@
         #---------------------------------------------------------------------
         # Login to LDAP automatically with HTTP header.
         # In below example for siteminder, at right side of = is header name.
-        #export HEADER_LOGIN_ID=BNPPUID
-        #export HEADER_LOGIN_FIRSTNAME=BNPPFIRSTNAME
-        #export HEADER_LOGIN_LASTNAME=BNPPLASTNAME
-        #export HEADER_LOGIN_EMAIL=BNPPEMAILADDRESS
+        #export HEADER_LOGIN_ID=HEADERUID
+        #export HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+        #export HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+        #export HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
         #---------------------------------------------------------------------
         # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
         # example : LOGOUT_WITH_TIMER=true