Merge remote-tracking branch 'upstream/master'

CHANGELOG.md

@@ -1,4 +1,19 @@
-# v3.13 2019-08-09 Wekan relese
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+- [On wekan master specifying ATTACHMENTS_STORE_PATH, it will try its best keeping original attachments, only newer
+  attachments will be stored into specified path](https://github.com/wekan/wekan/pull/2607).
+  Thanks to whowillcare.
+
+This release fixes the following bugs:
+
+- [Fix bug: Unable to disable richer comment editor](https://github.com/wekan/wekan/pull/2607).
+  Thanks to whowillcare.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.13 2019-08-09 Wekan release
 
 Update translations. Thanks to translators.
 

Dockerfile

@@ -22,6 +22,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 g++ build-essential
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
     ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
     RICHER_CARD_COMMENT_EDITOR=true \
+    ATTACHMENTS_STORE_PATH="" \
     MAX_IMAGE_PIXEL="" \
     IMAGE_COMPRESS_RATIO="" \
     BIGEVENTS_PATTERN="" \

snap-src/bin/wekan-help

@@ -81,9 +81,9 @@ echo -e "\t$ snap set $SNAP_NAME image-compress-ratio='80'"
 echo -e "Disabled:"
 echo -e "\t$ snap set $SNAP_NAME image-compress-ratio=''"
 echo -e "\n"
-echo -e "Allow to set attachment upload into specified server location https://github.com/wekan/wekan/pull/2603"
+echo -e "Allow to set attachment upload into specified server location. Create that directory first. https://github.com/wekan/wekan/pull/2603"
 echo -e "Example:"
-echo -e "\t$ snap set $SNAP_NAME attachments-store-path='/tmp/attachments'"
+echo -e "\t$ snap set $SNAP_NAME attachments-store-path='/var/snap/wekan/common/attachments'"
 echo -e "Disabled:"
 echo -e "\t$ snap set $SNAP_NAME attachments-store-path=''"
 echo -e "\n"