Browse Source

Update to newest GitHub flawored markdown.

Thanks to shaygover and xet7 !

Related #2334
Lauri Ojansivu 6 years ago
parent
commit
ba4d8b0b35

+ 10 - 0
CHANGELOG.md

@@ -1,3 +1,13 @@
+# Upcoming Wekan release
+
+This release 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.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.60 2019-04-08 Wekan release
 
 This release fixes the following bugs:

+ 1 - 0
Dockerfile

@@ -200,6 +200,7 @@ RUN \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \
+    gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules git://github.com/wekan/markdown.git && \
     gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \
     gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
     gosu wekan:wekan rm -rf meteor-accounts-oidc && \

+ 1 - 0
rebuild-wekan.bat

@@ -36,6 +36,7 @@ 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
 move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
 move meteor-accounts-oidc/packages/switch_oidc wekan_oidc
 del /S /F /Q meteor-accounts-oidc

+ 9 - 8
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";

+ 1 - 0
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

+ 1 - 0
releases/virtualbox/rebuild-wekan.sh

@@ -72,6 +72,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

+ 5 - 0
snapcraft.yaml

@@ -184,6 +184,11 @@ parts:
               rm -rf meteor-accounts-oidc
               cd ..
             fi
+            if [ ! -d "packages/markdown" ]; then
+              cd packages
+              git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
+              cd ..
+            fi
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser