Merge branch 'devel' into improve-mobile-ui

.meteor/packages

@@ -66,7 +66,6 @@ mquandalle:jquery-textcomplete
 mquandalle:jquery-ui-drag-drop-sort
 mquandalle:mousetrap-bindglobal
 peerlibrary:blaze-components@=0.15.1
-perak:markdown
 templates:tabs
 verron:autosize
 simple:json-routes
@@ -92,3 +91,4 @@ mquandalle:perfect-scrollbar
 mdg:meteor-apm-agent
 meteorhacks:unblock
 lucasantoniassi:accounts-lockout
+wekan-markdown

.meteor/versions

@@ -1,5 +1,6 @@
 3stack:presence@1.1.2
 accounts-base@1.4.0
+accounts-oauth@1.1.15
 accounts-password@1.5.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
@@ -121,7 +122,8 @@ mquandalle:perfect-scrollbar@0.6.5_2
 msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
 npm-mongo@2.2.33
-observe-sequence@1.0.16
+oauth@1.2.1
+oauth2@1.2.0
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.0.9
 peerlibrary:assert@0.2.5
@@ -129,7 +131,6 @@ peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
 peerlibrary:computed-field@0.7.0
 peerlibrary:reactive-field@0.3.0
-perak:markdown@1.0.5
 promise@0.10.0
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
@@ -176,4 +177,11 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
+wekan-accounts-oidc@1.0.10
+wekan-markdown@1.0.7
+wekan-oidc@1.0.12
+wekan-scrollbar@3.1.3
+wekan:accounts-cas@0.1.0
+wekan:wekan-ldap@0.0.2
+yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2

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:
@@ -43,7 +53,7 @@ Thanks to above GitHub users for their contributions and translators for their t
 This release fixes the following bugs, thanks to justinr1234:
 
 - [Add proper variables for join card](https://github.com/wekan/wekan/commit/289f1fe1340c85eb2af19825f4972e9057a86b7a),
-  fixes [Incorrect variable replacement on email notifications](https://github.com/wekan/wekan/issues/2295).
+  fixes [Incorrect variable replacement on email notifications](https://github.com/wekan/wekan/issues/2285).
 
 and fixes the following bugs with Apache I-CLA, thanks to bentiss:
 

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 && \

docker-compose.yml

@@ -170,8 +170,8 @@ services:
       # NOTE: Special characters need to be url-encoded in MAIL_URL.
       #       You can encode those characters for example at: https://www.urlencoder.org
       #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
-      - MAIL_URL='smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}'
+      - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
-      - MAIL_FROM='Wekan Notifications <noreply.wekan@mydomain.com>'
+      - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com>
       #---------------------------------------------------------------
       # ==== OPTIONAL: MONGO OPLOG SETTINGS =====
       # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587

i18n/de.i18n.json

@@ -586,34 +586,34 @@
     "r-is": "wird",
     "r-is-moved": "verschoben wird",
     "r-added-to": "hinzugefügt zu",
-    "r-removed-from": "Entfernt von",
+    "r-removed-from": "entfernt von",
     "r-the-board": "das Board",
     "r-list": "Liste",
     "set-filter": "Setze Filter",
-    "r-moved-to": "Verschieben nach",
+    "r-moved-to": "verschoben nach",
-    "r-moved-from": "Verschieben von",
+    "r-moved-from": "verschoben von",
-    "r-archived": "Ins Archiv verschieben",
+    "r-archived": "ins Archiv verschoben",
-    "r-unarchived": "Aus dem Archiv wiederhergestellt",
+    "r-unarchived": "aus dem Archiv wiederhergestellt",
-    "r-a-card": "eine Karte",
+    "r-a-card": "einer Karte",
-    "r-when-a-label-is": "Wenn ein Label ist",
+    "r-when-a-label-is": "Wenn ein Label",
-    "r-when-the-label-is": " Wenn das Label ist",
+    "r-when-the-label-is": " Wenn das Label",
     "r-list-name": "Listenname",
-    "r-when-a-member": "Wenn ein Mitglied ist",
+    "r-when-a-member": "Wenn ein Mitglied",
     "r-when-the-member": "Wenn das Mitglied",
     "r-name": "Name",
     "r-when-a-attach": "Wenn ein Anhang",
-    "r-when-a-checklist": "Wenn eine Checkliste ist",
+    "r-when-a-checklist": "Wenn eine Checkliste wird",
     "r-when-the-checklist": "Wenn die Checkliste",
-    "r-completed": "Abgeschlossen",
+    "r-completed": "abgeschlossen",
-    "r-made-incomplete": "Unvollständig gemacht",
+    "r-made-incomplete": "unvollständig gemacht",
-    "r-when-a-item": "Wenn ein Checklistenelement ist",
+    "r-when-a-item": "Wenn eine Checklistenposition",
-    "r-when-the-item": "Wenn das Checklistenelement",
+    "r-when-the-item": "Wenn die Checklistenposition",
-    "r-checked": "Markiert",
+    "r-checked": "markiert wird",
-    "r-unchecked": "Abgewählt",
+    "r-unchecked": "abgewählt wird",
-    "r-move-card-to": "Verschiebe Karte nach",
+    "r-move-card-to": "Verschiebe Karte an",
     "r-top-of": "Anfang von",
     "r-bottom-of": "Ende von",
-    "r-its-list": "seine Liste",
+    "r-its-list": "seiner Liste",
     "r-archive": "Ins Archiv verschieben",
     "r-unarchive": "Aus dem Archiv wiederherstellen",
     "r-card": "Karte",

i18n/hu.i18n.json

@@ -55,7 +55,7 @@
     "activity-removed": "%s eltávolítva innen: %s",
     "activity-sent": "%s elküldve ide: %s",
     "activity-unjoined": "%s kilépett a csoportból",
-    "activity-subtask-added": "added subtask to %s",
+    "activity-subtask-added": "Alfeladat hozzáadva ehhez: %s",
     "activity-checked-item": "checked %s in checklist %s of %s",
     "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "ellenőrzőlista hozzáadva ehhez: %s",
@@ -73,7 +73,7 @@
     "add-board": "Tábla hozzáadása",
     "add-card": "Kártya hozzáadása",
     "add-swimlane": "Add Swimlane",
-    "add-subtask": "Add Subtask",
+    "add-subtask": "Alfeladat hozzáadása",
     "add-checklist": "Ellenőrzőlista hozzáadása",
     "add-checklist-item": "Elem hozzáadása az ellenőrzőlistához",
     "add-cover": "Borító hozzáadása",
@@ -92,7 +92,7 @@
     "and-n-other-card_plural": "És __count__ egyéb kártya",
     "apply": "Alkalmaz",
     "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
-    "archive": "Move to Archive",
+    "archive": "Mozgatás az archívumba",
     "archive-all": "Move All to Archive",
     "archive-board": "Move Board to Archive",
     "archive-card": "Move Card to Archive",
@@ -125,10 +125,10 @@
     "boardChangeTitlePopup-title": "Tábla átnevezése",
     "boardChangeVisibilityPopup-title": "Láthatóság megváltoztatása",
     "boardChangeWatchPopup-title": "Megfigyelés megváltoztatása",
-    "boardMenuPopup-title": "Board Settings",
+    "boardMenuPopup-title": "Tábla beállítások",
     "boards": "Táblák",
     "board-view": "Tábla nézet",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Naptár",
     "board-view-swimlanes": "Swimlanes",
     "board-view-lists": "Listák",
     "bucket-example": "Mint például „Bakancslista”",
@@ -175,7 +175,7 @@
     "changePasswordPopup-title": "Jelszó megváltoztatása",
     "changePermissionsPopup-title": "Jogosultságok megváltoztatása",
     "changeSettingsPopup-title": "Beállítások megváltoztatása",
-    "subtasks": "Subtasks",
+    "subtasks": "Alfeladat",
     "checklists": "Ellenőrzőlisták",
     "click-to-star": "Kattintson a tábla csillagozásához.",
     "click-to-unstar": "Kattintson a tábla csillagának eltávolításához.",
@@ -216,7 +216,7 @@
     "no-comments": "No comments",
     "no-comments-desc": "Can not see comments and activities.",
     "computer": "Számítógép",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-subtask-delete-dialog": "Biztosan törölni szeretnél az alfeladatot?",
     "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
     "copy-card-link-to-clipboard": "Kártya hivatkozásának másolása a vágólapra",
     "linkCardPopup-title": "Link Card",
@@ -551,8 +551,8 @@
     "default-subtasks-board": "Subtasks for __board__ board",
     "default": "Default",
     "queue": "Queue",
-    "subtask-settings": "Subtasks Settings",
+    "subtask-settings": "Alfeladat beállítások",
-    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Tábla alfeladat beállítások",
     "show-subtasks-field": "Cards can have subtasks",
     "deposit-subtasks-board": "Deposit subtasks to this board:",
     "deposit-subtasks-list": "Landing list for subtasks deposited here:",
@@ -592,8 +592,8 @@
     "set-filter": "Set Filter",
     "r-moved-to": "Moved to",
     "r-moved-from": "Moved from",
-    "r-archived": "Moved to Archive",
+    "r-archived": "Archívumba helyezve",
-    "r-unarchived": "Restored from Archive",
+    "r-unarchived": "Helyreállítva az archívumból",
     "r-a-card": "a card",
     "r-when-a-label-is": "When a label is",
     "r-when-the-label-is": "When the label is",
@@ -614,8 +614,8 @@
     "r-top-of": "Top of",
     "r-bottom-of": "Bottom of",
     "r-its-list": "its list",
-    "r-archive": "Move to Archive",
+    "r-archive": "Mozgatás az archívumba",
-    "r-unarchive": "Restore from Archive",
+    "r-unarchive": "Helyreállítás az archívumból",
     "r-card": "card",
     "r-add": "Hozzáadás",
     "r-remove": "Remove",

i18n/it.i18n.json

@@ -683,5 +683,5 @@
     "error-ldap-login": "C'è stato un errore mentre provavi ad effettuare il login",
     "display-authentication-method": "Mostra il metodo di autenticazione",
     "default-authentication-method": "Metodo di autenticazione predefinito",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Duplica bacheca"
 }

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

rebuild-wekan.sh

@@ -111,7 +111,7 @@ do
         "Build Wekan")
 		echo "Building Wekan."
 		wekan_repo_check
-		rm -rf packages
+		rm -rf packages/kadira-flow-router packages/meteor-useraccounts-core packages/meteor-accounts-cas packages/wekan-ldap packages/wekan-ldap packages/wekan-scrfollbar packages/meteor-accounts-oidc packages/markdown
 		mkdir packages
 		cd packages
 		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
@@ -120,6 +120,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

releases/rebuild-release.sh

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

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

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

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