Przeglądaj źródła

Merge branch 'devel' into improve-mobile-ui

Lauri Ojansivu 6 lat temu
rodzic
commit
0f3579fd7b

+ 1 - 1
.meteor/packages

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

+ 11 - 3
.meteor/versions

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

+ 39 - 29
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
 # v2.60 2019-04-08 Wekan release
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
@@ -13,7 +23,7 @@ This release fixes the following bugs:
 
 
 - [Add variables for activity notifications, Fixes #2285](https://github.com/wekan/wekan/pull/2320).
 - [Add variables for activity notifications, Fixes #2285](https://github.com/wekan/wekan/pull/2320).
   Thanks to rinnaz.
   Thanks to rinnaz.
-    
+
 Thanks to above GitHub users for their contributions and translators for their translations.
 Thanks to above GitHub users for their contributions and translators for their translations.
 
 
 # v2.58 2019-04-06 Wekan release
 # v2.58 2019-04-06 Wekan release
@@ -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:
 This release fixes the following bugs, thanks to justinr1234:
 
 
 - [Add proper variables for join card](https://github.com/wekan/wekan/commit/289f1fe1340c85eb2af19825f4972e9057a86b7a),
 - [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:
 and fixes the following bugs with Apache I-CLA, thanks to bentiss:
 
 
@@ -78,7 +88,7 @@ Thanks to above GitHub users for their contributions and translators for their t
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
-- Fix typos.                              
+- Fix typos.
 - [Fix Outgoing Webhook message about created new swimlane](https://github.com/wekan/wekan/issues/1969).
 - [Fix Outgoing Webhook message about created new swimlane](https://github.com/wekan/wekan/issues/1969).
 
 
 Thanks to above GitHub users for their contributions and translators for their translations.
 Thanks to above GitHub users for their contributions and translators for their translations.
@@ -111,7 +121,7 @@ and fixes the following bugs:
 
 
 - [Fix IFTTT email sending](https://github.com/wekan/wekan/pull/2279).
 - [Fix IFTTT email sending](https://github.com/wekan/wekan/pull/2279).
   Thanks to justinr1234.
   Thanks to justinr1234.
-    
+
 Thanks to above GitHub users for their contributions.
 Thanks to above GitHub users for their contributions.
 
 
 # v2.51 2019-03-21 Wekan release
 # v2.51 2019-03-21 Wekan release
@@ -232,7 +242,7 @@ and reverts the following change of v2.42, because they did not fix anything, th
 
 
 - [Revert: Tried to fix snap mongodb-control not starting database](https://github.com/wekan/wekan/commit/4055f451fdadfbfdef9a10be29a0eb6aed91182c).
 - [Revert: Tried to fix snap mongodb-control not starting database](https://github.com/wekan/wekan/commit/4055f451fdadfbfdef9a10be29a0eb6aed91182c).
 
 
-Thanks to above GitHub users for their contributions, and translators for their translations.  
+Thanks to above GitHub users for their contributions, and translators for their translations.
 
 
 # v2.42 2019-03-07 Wekan release
 # v2.42 2019-03-07 Wekan release
 
 
@@ -271,7 +281,7 @@ This release fixes the following bugs:
 - [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
 - [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
   [manifest](https://github.com/wekan/wekan/issues/2168) and
   [manifest](https://github.com/wekan/wekan/issues/2168) and
   [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
   [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
-    
+
 Thanks to above GitHub users for their contributions, and translators for their translations.
 Thanks to above GitHub users for their contributions, and translators for their translations.
 
 
 # v2.38 2019-03-06 Wekan release
 # v2.38 2019-03-06 Wekan release
@@ -323,13 +333,13 @@ and moved the following code around:
   xet7 can make changes directly and GitHub issues are enabled.
   xet7 can make changes directly and GitHub issues are enabled.
 
 
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
-    
+
 # v2.35 2019-03-01 Wekan release
 # v2.35 2019-03-01 Wekan release
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
-- [Add Filter fix back](https://github.com/wekan/wekan/issues/2213), 
-  because there was no bug in filter fix.              
+- [Add Filter fix back](https://github.com/wekan/wekan/issues/2213),
+  because there was no bug in filter fix.
 
 
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
 
 
@@ -395,7 +405,7 @@ This release adds the following new Sandstorm features and fixes:
 - New Sandstorm board first user is Admin and [has IFTTT Rules](https://github.com/wekan/wekan/issues/2125) and Standalone Wekan Admin Panel.
 - New Sandstorm board first user is Admin and [has IFTTT Rules](https://github.com/wekan/wekan/issues/2125) and Standalone Wekan Admin Panel.
   Probably some Admin Panel features do not work yet. Please keep backup of your grains before testing Admin Panel.
   Probably some Admin Panel features do not work yet. Please keep backup of your grains before testing Admin Panel.
 - Linked Cards and Linked Boards.
 - Linked Cards and Linked Boards.
-- Some not needed options like Logout etc have been hidden from top bar right menu. 
+- Some not needed options like Logout etc have been hidden from top bar right menu.
 - [Import board now works. "Board not found" is not problem anymore](https://github.com/wekan/wekan/issues/1430), because you can go to All Boards page to change to imported board.
 - [Import board now works. "Board not found" is not problem anymore](https://github.com/wekan/wekan/issues/1430), because you can go to All Boards page to change to imported board.
 
 
 and removes the following features:
 and removes the following features:
@@ -477,7 +487,7 @@ and fixes the following bugs:
    mobile browser](https://github.com/wekan/wekan/issues/2183). Thanks to xet7.
    mobile browser](https://github.com/wekan/wekan/issues/2183). Thanks to xet7.
 
 
 Thanks to above GitHub users for their contributions, and translators for their translations.
 Thanks to above GitHub users for their contributions, and translators for their translations.
-    
+
 # v2.21 2019-02-12 Wekan release
 # v2.21 2019-02-12 Wekan release
 
 
 This release adds the following new features:
 This release adds the following new features:
@@ -534,12 +544,12 @@ and fixes the following bugs with Apache I-CLA, thanks to bentiss:
       header)
       header)
     - make sure the placeholder never get placed between the header and the
     - make sure the placeholder never get placed between the header and the
       list of cards in a swimlane
       list of cards in a swimlane
-    - fix the finding of the next and previous list of cards. 
+    - fix the finding of the next and previous list of cards.
     For all of this to be successful, we need to resize the swimlanes to a
     For all of this to be successful, we need to resize the swimlanes to a
     known value. This can lead to some visual jumps with scrolling when you
     known value. This can lead to some visual jumps with scrolling when you
     drag or drop the swimlanea. I tried to remedy that by computing the new
     drag or drop the swimlanea. I tried to remedy that by computing the new
     scroll value. Still not ideal however, as there are still some jumps when
     scroll value. Still not ideal however, as there are still some jumps when
-    dropping.    
+    dropping.
     Fixes [#2159](https://github.com/wekan/wekan/issues/2159).
     Fixes [#2159](https://github.com/wekan/wekan/issues/2159).
 
 
 Thanks to above GitHub users and translators for contributions.
 Thanks to above GitHub users and translators for contributions.
@@ -567,7 +577,7 @@ Thanks to GitHub user ChronikEwok for contributions.
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
-- [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board 
+- [Fix: Not displaying card content of public board: Snap, Docker and Sandstorm Shared Wekan Board
   Link](https://github.com/wekan/wekan/issues/1623) with
   Link](https://github.com/wekan/wekan/issues/1623) with
   [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
   [code from ChronikEwok](https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de).
 
 
@@ -599,7 +609,7 @@ This release adds the following new features with Apache I-CLA, thanks to bentis
 - [When writing to minicard, press Shift-Enter on minicard to go to next line
 - [When writing to minicard, press Shift-Enter on minicard to go to next line
   below](https://github.com/wekan/wekan/commit/7a35099fb9778d5f3656a57c74af426cfb20fba3),
   below](https://github.com/wekan/wekan/commit/7a35099fb9778d5f3656a57c74af426cfb20fba3),
   to continue writing on same minicard 2nd line.
   to continue writing on same minicard 2nd line.
-    
+
 Thanks to GitHub user bentiss for contributions.
 Thanks to GitHub user bentiss for contributions.
 
 
 # v2.12 2019-01-31 Wekan release
 # v2.12 2019-01-31 Wekan release
@@ -724,7 +734,7 @@ and fixes the following bugs with Apache I-CLA, thanks to bentiss:
 - [Make sure Swimlanes and Lists have a populated sort field](https://github.com/wekan/wekan/commit/5c6a725712a443b4d03b4f86262033ddfb66bc3d).
 - [Make sure Swimlanes and Lists have a populated sort field](https://github.com/wekan/wekan/commit/5c6a725712a443b4d03b4f86262033ddfb66bc3d).
   When moving around the swimlanes or the lists, if one element has a sort
   When moving around the swimlanes or the lists, if one element has a sort
   with a null value, the computation of the new sort value is aborted,
   with a null value, the computation of the new sort value is aborted,
-  meaning that there are glitches in the UI.    
+  meaning that there are glitches in the UI.
   This happens on the first swimlane created with the new board, or when
   This happens on the first swimlane created with the new board, or when
   a swimlane or a list gets added through the API;
   a swimlane or a list gets added through the API;
 - UI: Lists: [Make sure all lists boxes are the same height](https://github.com/wekan/wekan/commit/97d95b4bcbcab86629e368ea41bb9f00450b21f6).
 - UI: Lists: [Make sure all lists boxes are the same height](https://github.com/wekan/wekan/commit/97d95b4bcbcab86629e368ea41bb9f00450b21f6).
@@ -794,7 +804,7 @@ and fixes the following bugs:
   - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is
   - When clicking Move Card, go to correct page position. Currently it's at empty page position, and there is
     need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible.
     need to scroll page up to see Move Card options. It should work similarly like Copy Card, that is visible.
   - Also check that other buttons go to visible page.
   - Also check that other buttons go to visible page.
-    
+
 Thanks to above GitHub users for their contributions.
 Thanks to above GitHub users for their contributions.
 
 
 # v1.97 2018-12-26 Wekan release
 # v1.97 2018-12-26 Wekan release
@@ -803,7 +813,7 @@ This release adds the following new features:
 
 
 - Upgrade to Node 8.15.0 and MongoDB 3.2.22.
 - Upgrade to Node 8.15.0 and MongoDB 3.2.22.
 - Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken.
 - Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken.
-    
+
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
 
 
 # v1.96 2018-12-24 Wekan release
 # v1.96 2018-12-24 Wekan release
@@ -965,7 +975,7 @@ Thanks to GitHub user xet7 for contributions.
 
 
 This release fixes the following bugs:
 This release fixes the following bugs:
 
 
-- Remove extra commas `,` and add missing backslash `\`. 
+- Remove extra commas `,` and add missing backslash `\`.
   Maybe after that login, logout and CORS works.
   Maybe after that login, logout and CORS works.
 
 
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
@@ -1120,7 +1130,7 @@ and hides the following features at Sandstorm:
 
 
 - Hide Linked Card and Linked Board on Sandstorm, because they are only
 - Hide Linked Card and Linked Board on Sandstorm, because they are only
   useful when having multiple boards, and at Sandstorm
   useful when having multiple boards, and at Sandstorm
-  there is only one board per grain. Thanks to ocdtrekkie and xet7. Closes #1982 
+  there is only one board per grain. Thanks to ocdtrekkie and xet7. Closes #1982
 
 
 Thanks to above mentioned GitHub users for their contributions.
 Thanks to above mentioned GitHub users for their contributions.
 
 
@@ -1282,7 +1292,7 @@ and tries to fix the following bugs:
 - Try to fix snap.
 - Try to fix snap.
 
 
 Thanks to GitHub users Akuket and xet7 for their contributions.
 Thanks to GitHub users Akuket and xet7 for their contributions.
-    
+
 # v1.53.5 2018-10-10 Wekan Edge relase
 # v1.53.5 2018-10-10 Wekan Edge relase
 
 
 This release tries to fix the following bugs:
 This release tries to fix the following bugs:
@@ -1306,7 +1316,7 @@ This release adds the following new features:
 - [Upgrade](https://github.com/wekan/wekan/issues/1522) to [Meteor](https://blog.meteor.com/meteor-1-8-erases-the-debts-of-1-7-77af4c931fe3) [1.8.1-beta.0](https://github.com/meteor/meteor/issues/10216).
 - [Upgrade](https://github.com/wekan/wekan/issues/1522) to [Meteor](https://blog.meteor.com/meteor-1-8-erases-the-debts-of-1-7-77af4c931fe3) [1.8.1-beta.0](https://github.com/meteor/meteor/issues/10216).
   with [these](https://github.com/wekan/wekan/commit/079e45eb52a0f62ddb6051bf2ea80fac8860d3d5)
   with [these](https://github.com/wekan/wekan/commit/079e45eb52a0f62ddb6051bf2ea80fac8860d3d5)
   [commits](https://github.com/wekan/wekan/commit/dd47d46f4341a8c4ced05749633f783e88623e1b). So now it's possible to use MongoDB 2.6 - 4.0.
   [commits](https://github.com/wekan/wekan/commit/dd47d46f4341a8c4ced05749633f783e88623e1b). So now it's possible to use MongoDB 2.6 - 4.0.
-  
+
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
 
 
 # v1.53.2 2018-10-10 Wekan Edge release
 # v1.53.2 2018-10-10 Wekan Edge release
@@ -1334,7 +1344,7 @@ and fixes the following bugs:
 - [Feature rules: fixes and enhancements](https://github.com/wekan/wekan/pull/1936).
 - [Feature rules: fixes and enhancements](https://github.com/wekan/wekan/pull/1936).
 
 
 Thanks to GitHub users Akuket, Angtrim, dcmcand, lberk, maximest-pierre, InfoSec812, schulz and xet7 for their contributions.
 Thanks to GitHub users Akuket, Angtrim, dcmcand, lberk, maximest-pierre, InfoSec812, schulz and xet7 for their contributions.
-    
+
 # v1.52.1 2018-10-02 Wekan Edge release
 # v1.52.1 2018-10-02 Wekan Edge release
 
 
 This release adds the following new features:
 This release adds the following new features:
@@ -1349,7 +1359,7 @@ and reverts previous change:
   Oidc already works with [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper-provider-app).
   Oidc already works with [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper-provider-app).
 
 
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
-    
+
 # v1.51.2 2018-09-30 Wekan Edge release
 # v1.51.2 2018-09-30 Wekan Edge release
 
 
 This release adds the following new features:
 This release adds the following new features:
@@ -1408,7 +1418,7 @@ Thanks to GitHub users Angtrim, maurice-schleussinger, suprovsky and xet7 for th
 This release adds the following new features:
 This release adds the following new features:
 
 
 - Change from Node v8.12.0 prerelease to use official Node v8.12.0.
 - Change from Node v8.12.0 prerelease to use official Node v8.12.0.
-    
+
 Thanks to GitHub user xet7 for contributions.
 Thanks to GitHub user xet7 for contributions.
 
 
 # v1.49 2018-09-17 Wekan release
 # v1.49 2018-09-17 Wekan release
@@ -1566,10 +1576,10 @@ Thanks to GitHub users hever, salleman33, tlevine and xet7 for their contributio
 This release adds the following new features:
 This release adds the following new features:
 
 
 Add Caddy plugins:
 Add Caddy plugins:
-- [http.filter](https://caddyserver.com/docs/http.filter) 
+- [http.filter](https://caddyserver.com/docs/http.filter)
   for changing Wekan UI on the fly, for example custom logo,
   for changing Wekan UI on the fly, for example custom logo,
   or changing to all different CSS file to have custom theme;
   or changing to all different CSS file to have custom theme;
-- [http.ipfilter](https://caddyserver.com/docs/http.ipfilter) 
+- [http.ipfilter](https://caddyserver.com/docs/http.ipfilter)
   to block requests by ip address;
   to block requests by ip address;
 - [http.realip](https://caddyserver.com/docs/http.realip)
 - [http.realip](https://caddyserver.com/docs/http.realip)
   for showing real X-Forwarded-For IP to behind proxy;
   for showing real X-Forwarded-For IP to behind proxy;
@@ -1865,7 +1875,7 @@ and fixes the following bugs:
 * To fix ["title is required"](https://github.com/wekan/wekan/issues/1576) fix only
 * To fix ["title is required"](https://github.com/wekan/wekan/issues/1576) fix only
   [add-checklist-items and revert all other migration changes](https://github.com/wekan/wekan/issues/1734);
   [add-checklist-items and revert all other migration changes](https://github.com/wekan/wekan/issues/1734);
 * [Restore invitation code logic](https://github.com/wekan/wekan/pull/1732). Please test and add comment
 * [Restore invitation code logic](https://github.com/wekan/wekan/pull/1732). Please test and add comment
-  to those invitation code issues that this fixes. 
+  to those invitation code issues that this fixes.
 
 
 Thanks to GitHub users TNick and xet7 for their contributions.
 Thanks to GitHub users TNick and xet7 for their contributions.
 
 
@@ -2036,7 +2046,7 @@ This release adds the following new features:
 and fixes the following bugs:
 and fixes the following bugs:
 
 
 * [Error: title is required](https://github.com/wekan/wekan/issues/1576).
 * [Error: title is required](https://github.com/wekan/wekan/issues/1576).
-    
+
 Thanks to GitHub users Shahar-Y, thiagofernando and ThisNeko for their contributions.
 Thanks to GitHub users Shahar-Y, thiagofernando and ThisNeko for their contributions.
 
 
 # v0.94 2018-05-03 Wekan release
 # v0.94 2018-05-03 Wekan release

+ 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-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/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 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_accounts-oidc wekan_accounts-oidc && \
     gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
     gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
     gosu wekan:wekan rm -rf meteor-accounts-oidc && \
     gosu wekan:wekan rm -rf meteor-accounts-oidc && \

+ 2 - 2
docker-compose.yml

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

+ 18 - 18
i18n/de.i18n.json

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

+ 13 - 13
i18n/hu.i18n.json

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

+ 2 - 2
i18n/it.i18n.json

@@ -1,6 +1,6 @@
 {
 {
     "accept": "Accetta",
     "accept": "Accetta",
-    "act-activity-notify": "Notifica attività ",
+    "act-activity-notify": "Notifica attività",
     "act-addAttachment": "aggiunto allegato __attachment__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
     "act-addAttachment": "aggiunto allegato __attachment__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
     "act-deleteAttachment": "eliminato allegato __attachment__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
     "act-deleteAttachment": "eliminato allegato __attachment__ dalla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
     "act-addSubtask": "aggiunto sottotask __subtask__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
     "act-addSubtask": "aggiunto sottotask __subtask__ alla scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__",
@@ -683,5 +683,5 @@
     "error-ldap-login": "C'è stato un errore mentre provavi ad effettuare il login",
     "error-ldap-login": "C'è stato un errore mentre provavi ad effettuare il login",
     "display-authentication-method": "Mostra il metodo di autenticazione",
     "display-authentication-method": "Mostra il metodo di autenticazione",
     "default-authentication-method": "Metodo di autenticazione predefinito",
     "default-authentication-method": "Metodo di autenticazione predefinito",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Duplica bacheca"
 }
 }

+ 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-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/wekan-scrollbar.git
 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.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_accounts-oidc wekan_accounts-oidc
 move meteor-accounts-oidc/packages/switch_oidc wekan_oidc
 move meteor-accounts-oidc/packages/switch_oidc wekan_oidc
 del /S /F /Q meteor-accounts-oidc
 del /S /F /Q meteor-accounts-oidc

+ 2 - 1
rebuild-wekan.sh

@@ -111,7 +111,7 @@ do
         "Build Wekan")
         "Build Wekan")
 		echo "Building Wekan."
 		echo "Building Wekan."
 		wekan_repo_check
 		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
 		mkdir packages
 		cd packages
 		cd 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/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-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/wekan-scrollbar.git
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.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_accounts-oidc wekan_accounts-oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 rm -rf meteor-accounts-oidc
                 rm -rf meteor-accounts-oidc

+ 9 - 8
releases/rebuild-release.sh

@@ -5,14 +5,15 @@
 		rm -rf packages
 		rm -rf packages
 		mkdir -p ~/repos/wekan/packages
 		mkdir -p ~/repos/wekan/packages
 		cd ~/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
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			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-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/wekan-scrollbar.git
                 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.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_accounts-oidc wekan_accounts-oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 rm -rf meteor-accounts-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-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/wekan-scrollbar.git
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.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_accounts-oidc wekan_accounts-oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
                 rm -rf meteor-accounts-oidc
                 rm -rf meteor-accounts-oidc

+ 5 - 0
snapcraft.yaml

@@ -184,6 +184,11 @@ parts:
               rm -rf meteor-accounts-oidc
               rm -rf meteor-accounts-oidc
               cd ..
               cd ..
             fi
             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
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
             meteor npm install --allow-superuser