diff options
63 files changed, 344 insertions, 211 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index dca55329..8a92ed83 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,6 +3,7 @@ **Server Setup Information**: * Did you test in newest Wekan?: +* For new Wekan install, did you configure root-url correctly https://github.com/wekan/wekan/wiki/Settings ? * Wekan version: * If this is about old version of Wekan, what upgrade problem you have?: * Operating System: diff --git a/CHANGELOG.md b/CHANGELOG.md index 191bd9b6..49a1fbf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,18 @@ # Upcoming Wekan release. +This release adds the following new features: + - [LDAP](https://github.com/wekan/wekan/commit/288800eafc91d07f859c4f59588e0b646137ccb9). In progress. Please test and [add info about bugs](https://github.com/wekan/wekan/issues/119). - -Thanks to GitHub users maximest-pierre, Akuket and xet7 for their contributions. + +and fixes the following bugs: + +- [OpenShift: Drop default namespace value and duplicate WEKAN_SERVICE_NAME parameter.commit](https://github.com/wekan/wekan/commit/fcc3560df4dbcc418c63470776376238af4f6ddc); +- [Fix Card URL](https://github.com/wekan/wekan/pull/1932); +- [Add info about root-url to GitHub issue template](https://github.com/wekan/wekan/commit/4c0eb7dcc19ca9ae8c5d2d0276e0d024269de236); +- [Feature rules: fixes and enhancements](https://github.com/wekan/wekan/pull/1936). + +Thanks to GitHub users Akuket, Angtrim, lberk, maximest-pierre, InfoSec812, schulz and xet7 for their contributions. # v1.52.1 2018-10-02 Wekan Edge release @@ -1,5 +1,16 @@ # Wekan +## Stable + +- master+devel branch. At release, devel is merged to master. +- Receives fixes and features that have been tested at edge that they work. +- If you want automatic updates, [use Snap](https://github.com/wekan/wekan-snap/wiki/Install). +- If you want to test before update, [use Docker quay.io release tags](https://github.com/wekan/wekan/wiki/Docker). + +## Edge + +- edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs). + [](https://transifex.com/wekan/wekan) [![Wekan Vanila Chat][vanila_badge]][vanila_chat] diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index b68c9b12..ccbd0f23 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -147,6 +147,13 @@ BlazeComponent.extendComponent({ }); }, + scrollTop(position = 0) { + const swimlanes = this.$('.js-swimlanes'); + swimlanes && swimlanes.animate({ + scrollTop: position, + }); + }, + }).register('boardBody'); BlazeComponent.extendComponent({ diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 2cd399c1..da0f126a 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -69,6 +69,20 @@ BlazeComponent.extendComponent({ if (offset) { bodyBoardComponent.scrollLeft(cardContainerScroll + offset); } + + //Scroll top + const cardViewStartTop = $cardView.offset().top; + const cardContainerScrollTop = $cardContainer.scrollTop(); + let topOffset = false; + if(cardViewStartTop < 0){ + topOffset = 0; + } else if(cardViewStartTop - cardContainerScrollTop > 100) { + topOffset = cardViewStartTop - cardContainerScrollTop - 100; + } + if(topOffset !== false) { + bodyBoardComponent.scrollTop(topOffset); + } + }, presentParentTask() { @@ -96,7 +110,11 @@ BlazeComponent.extendComponent({ }, onRendered() { - if (!Utils.isMiniScreen()) this.scrollParentContainer(); + if (!Utils.isMiniScreen()) { + Meteor.setTimeout(() => { + this.scrollParentContainer(); + }, 500); + } const $checklistsDom = this.$('.card-checklist-items'); $checklistsDom.sortable({ diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 888fbe00..20ece562 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); const knowedUsers = currentBoard.members.map((member) => { - member.username = Users.findOne(member.userId).username; + const u = Users.findOne(member.userId); + if(u){ + member.username = u.username; + } return member; }); const mentionRegex = /\B@([\w.]*)/gi; diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade index b9a1351c..1f351357 100644 --- a/client/components/rules/ruleDetails.jade +++ b/client/components/rules/ruleDetails.jade @@ -14,5 +14,9 @@ template(name="ruleDetails") div.trigger-content div.trigger-text = action + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file diff --git a/client/components/rules/ruleDetails.js b/client/components/rules/ruleDetails.js index 386b2b48..17c86dc3 100644 --- a/client/components/rules/ruleDetails.js +++ b/client/components/rules/ruleDetails.js @@ -14,7 +14,9 @@ BlazeComponent.extendComponent({ const trigger = Triggers.findOne({ _id: rule.triggerId, }); - return trigger.description(); + const desc = trigger.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, action() { const ruleId = this.data().ruleId; @@ -24,7 +26,9 @@ BlazeComponent.extendComponent({ const action = Actions.findOne({ _id: rule.actionId, }); - return action.description(); + const desc = action.description(); + const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1); + return upperdesc; }, events() { diff --git a/client/components/rules/rules.styl b/client/components/rules/rules.styl index 45ce4003..b52f84a7 100644 --- a/client/components/rules/rules.styl +++ b/client/components/rules/rules.styl @@ -32,6 +32,17 @@ display: inline-block float: right margin: auto +.rules-back + display: block + overflow: auto + margin-top: 15px + margin-bottom: 5px + button + display: inline-block + float: right + margin: auto + margin-right:14px + .flex display: -webkit-box display: -moz-box diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade index 8dfceeeb..4bcff769 100644 --- a/client/components/rules/rulesActions.jade +++ b/client/components/rules/rulesActions.jade @@ -22,4 +22,8 @@ template(name="rulesActions") else if ($eq currentActions.get 'checklist') +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar) else if ($eq currentActions.get 'mail') - +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar)
\ No newline at end of file + +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js index ecba857b..64a5c70e 100644 --- a/client/components/rules/rulesActions.js +++ b/client/components/rules/rulesActions.js @@ -41,16 +41,16 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-actions' (event) { + 'click .js-set-board-actions'(){ this.setBoardActions(); }, - 'click .js-set-card-actions' (event) { + 'click .js-set-card-actions'() { this.setCardActions(); }, - 'click .js-set-mail-actions' (event) { + 'click .js-set-mail-actions'() { this.setMailActions(); }, - 'click .js-set-checklist-actions' (event) { + 'click .js-set-checklist-actions'() { this.setChecklistActions(); }, }]; diff --git a/client/components/rules/rulesMain.js b/client/components/rules/rulesMain.js index 65cc3d98..0752a541 100644 --- a/client/components/rules/rulesMain.js +++ b/client/components/rules/rulesMain.js @@ -24,7 +24,7 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-delete-rule' (event) { + 'click .js-delete-rule' () { const rule = this.currentData(); Rules.remove(rule._id); Actions.remove(rule.actionId); @@ -34,9 +34,11 @@ BlazeComponent.extendComponent({ 'click .js-goto-trigger' (event) { event.preventDefault(); const ruleTitle = this.find('#ruleTitle').value; - this.find('#ruleTitle').value = ''; - this.ruleName.set(ruleTitle); - this.setTrigger(); + if(ruleTitle !== undefined && ruleTitle !== ''){ + this.find('#ruleTitle').value = ''; + this.ruleName.set(ruleTitle); + this.setTrigger(); + } }, 'click .js-goto-action' (event) { event.preventDefault(); @@ -46,6 +48,15 @@ BlazeComponent.extendComponent({ event.preventDefault(); this.setRulesList(); }, + 'click .js-goback' (event) { + event.preventDefault(); + if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){ + this.setRulesList(); + } + if(this.rulesCurrentTab.get() === 'action'){ + this.setTrigger(); + } + }, 'click .js-goto-details' (event) { event.preventDefault(); const rule = this.currentData(); diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade index 0ef5edfa..01c0cad5 100644 --- a/client/components/rules/rulesTriggers.jade +++ b/client/components/rules/rulesTriggers.jade @@ -18,4 +18,8 @@ template(name="rulesTriggers") else if showCardTrigger.get +cardTriggers else if showChecklistTrigger.get - +checklistTriggers
\ No newline at end of file + +checklistTriggers + div.rules-back + button.js-goback + i.fa.fa-chevron-left + | {{{_ 'r-back'}}}
\ No newline at end of file diff --git a/client/components/rules/rulesTriggers.js b/client/components/rules/rulesTriggers.js index 506e63b2..e3c16221 100644 --- a/client/components/rules/rulesTriggers.js +++ b/client/components/rules/rulesTriggers.js @@ -39,13 +39,13 @@ BlazeComponent.extendComponent({ }, events() { return [{ - 'click .js-set-board-triggers' (event) { + 'click .js-set-board-triggers' () { this.setBoardTriggers(); }, - 'click .js-set-card-triggers' (event) { + 'click .js-set-card-triggers' () { this.setCardTriggers(); }, - 'click .js-set-checklist-triggers' (event) { + 'click .js-set-checklist-triggers' () { this.setChecklistTriggers(); }, }]; diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 62e886e5..79c2c439 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "رجوع" }
\ No newline at end of file diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 9a8c8b65..9694e362 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" }
\ No newline at end of file diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 467c99d9..11b03b67 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index dd54348e..d4f8a9e4 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Enrere" }
\ No newline at end of file diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index e9bc74ab..4ab246ff 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Přidat pravidlo", "r-view-rule": "Zobrazit pravidlo", "r-delete-rule": "Smazat pravidlo", - "r-new-rule-name": "Přidat nové pravidlo", + "r-new-rule-name": "New rule title", "r-no-rules": "Žádná pravidla", "r-when-a-card-is": "Pokud je karta", "r-added-to": "Přidáno do", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Přidat checklist", "r-d-remove-checklist": "Odstranit checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Zpět" }
\ No newline at end of file diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 408224fd..0061cd20 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Regel hinzufügen", "r-view-rule": "Regel anzeigen", "r-delete-rule": "Regel löschen", - "r-new-rule-name": "Neue Regel hinzufügen", + "r-new-rule-name": "New rule title", "r-no-rules": "Keine Regeln", "r-when-a-card-is": "Wenn eine Karte ist", "r-added-to": "Hinzugefügt zu", @@ -575,7 +575,7 @@ "r-checklist": "Checkliste", "r-check-all": "Alle markieren", "r-uncheck-all": "Alle demarkieren", - "r-item-check": "Elemente der Checkliste", + "r-items-check": "items of checklist", "r-check": "Markieren", "r-uncheck": "Demarkieren", "r-item": "Element", @@ -606,5 +606,6 @@ "r-d-check-of-list": "der Checkliste", "r-d-add-checklist": "Checkliste hinzufügen", "r-d-remove-checklist": "Checkliste entfernen", - "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird" + "r-when-a-card-is-moved": "Wenn eine Karte in eine andere Liste verschoben wird", + "r-back": "Zurück" }
\ No newline at end of file diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index 6f9c3a66..8eaf0547 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Πίσω" }
\ No newline at end of file diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index bf2dbea3..2bd95662 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 152f1d7c..7b27f486 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -576,7 +576,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -608,6 +608,7 @@ "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back", "ldap": "Ldap", "oauth2": "Oauth2", "cas": "Cas", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index a61208b3..a198a3ca 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Reen" }
\ No newline at end of file diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index a2d55ac2..ed498502 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atrás" }
\ No newline at end of file diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 1c11035b..10e52b72 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atrás" }
\ No newline at end of file diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 19e36b19..8175de0b 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Atzera" }
\ No newline at end of file diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 9ebaee6a..43b41309 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "بازگشت" }
\ No newline at end of file diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 753acfaf..913b0756 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Lisää sääntö", "r-view-rule": "Näytä sääntö", "r-delete-rule": "Poista sääntö", - "r-new-rule-name": "Lisää uusi sääntö", + "r-new-rule-name": "Uuden säännön otsikko", "r-no-rules": "Ei sääntöjä", "r-when-a-card-is": "Kun kortti on", "r-added-to": "Lisätty kohteeseen", @@ -575,7 +575,7 @@ "r-checklist": "tarkistuslista", "r-check-all": "Ruksaa kaikki", "r-uncheck-all": "Poista ruksi kaikista", - "r-item-check": "Kohtaa tarkistuslistassa", + "r-items-check": "kohtaa tarkistuslistassa", "r-check": "Ruksaa", "r-uncheck": "Poista ruksi", "r-item": "kohta", @@ -606,5 +606,6 @@ "r-d-check-of-list": "tarkistuslistasta", "r-d-add-checklist": "Lisää tarkistuslista", "r-d-remove-checklist": "Poista tarkistuslista", - "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan" + "r-when-a-card-is-moved": "Kun kortti on siirretty toiseen listaan", + "r-back": "Takaisin" }
\ No newline at end of file diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 47da1ee2..666afaa3 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Ajouter une règle", "r-view-rule": "Voir la règle", "r-delete-rule": "Supprimer la règle", - "r-new-rule-name": "Ajouter une nouvelle règle", + "r-new-rule-name": "New rule title", "r-no-rules": "Pas de règles", "r-when-a-card-is": "Quand une carte est", "r-added-to": "Ajouté à", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Tout cocher", "r-uncheck-all": "Tout décocher", - "r-item-check": "Éléments de la checklist", + "r-items-check": "items of checklist", "r-check": "Cocher", "r-uncheck": "Décocher", "r-item": "élément", @@ -606,5 +606,6 @@ "r-d-check-of-list": "de la checklist", "r-d-add-checklist": "Ajouter une checklist", "r-d-remove-checklist": "Supprimer la checklist", - "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste" + "r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste", + "r-back": "Retour" }
\ No newline at end of file diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 759bd1cd..02df41df 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index ff52b699..34d6a0bd 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "הוספת כלל", "r-view-rule": "הצגת כלל", "r-delete-rule": "מחיקת כל", - "r-new-rule-name": "הוספת כלל חדש", + "r-new-rule-name": "New rule title", "r-no-rules": "אין כללים", "r-when-a-card-is": "כאשר כרטיס", "r-added-to": "נוסף אל", @@ -575,7 +575,7 @@ "r-checklist": "רשימת משימות", "r-check-all": "לסמן הכול", "r-uncheck-all": "לבטל את הסימון", - "r-item-check": "פריטים לרשימת משימות", + "r-items-check": "items of checklist", "r-check": "סימון", "r-uncheck": "ביטול סימון", "r-item": "פריט", @@ -606,5 +606,6 @@ "r-d-check-of-list": "של רשימת משימות", "r-d-add-checklist": "הוספת רשימת משימות", "r-d-remove-checklist": "הסרת רשימת משימות", - "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת" + "r-when-a-card-is-moved": "כאשר כרטיס מועבר לרשימה אחרת", + "r-back": "חזרה" }
\ No newline at end of file diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 1ebe8bef..989bc046 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Vissza" }
\ No newline at end of file diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index d37621bc..e59f2b2a 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 11ce4d45..1124fc1b 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Kembali" }
\ No newline at end of file diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 9ff7f64c..7ca45a9f 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 85c760c6..383c19a0 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Indietro" }
\ No newline at end of file diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index c86845b7..4d471c8a 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "戻る" }
\ No newline at end of file diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 3012bb3e..0c380495 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "უკან" }
\ No newline at end of file diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 0e6c8934..a1f10b5f 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 17d42a59..ef5cd2a8 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "뒤로" }
\ No newline at end of file diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 7baad114..19a11148 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index e7698c57..c07943cc 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 15d8a651..7192b06e 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Tilbake" }
\ No newline at end of file diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 51332157..74181664 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Terug" }
\ No newline at end of file diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 85c7dca4..e9638c5f 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Dodaj regułę", "r-view-rule": "Zobacz regułę", "r-delete-rule": "Usuń regułę", - "r-new-rule-name": "Dodaj nową regułę", + "r-new-rule-name": "New rule title", "r-no-rules": "Brak regułę", "r-when-a-card-is": "Gdy karta jest", "r-added-to": "Dodano do", @@ -575,7 +575,7 @@ "r-checklist": "lista zadań", "r-check-all": "Zaznacz wszystkie", "r-uncheck-all": "Odznacz wszystkie", - "r-item-check": "Elementy listy zadań", + "r-items-check": "items of checklist", "r-check": "Zaznacz", "r-uncheck": "Odznacz", "r-item": "element", @@ -606,5 +606,6 @@ "r-d-check-of-list": "z listy zadań", "r-d-add-checklist": "Dodaj listę zadań", "r-d-remove-checklist": "Usuń listę zadań", - "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy" + "r-when-a-card-is-moved": "Gdy karta jest przeniesiona do innej listy", + "r-back": "Wstecz" }
\ No newline at end of file diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 8338b68b..fab66d39 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -541,9 +541,9 @@ "r-list": "list", "r-moved-to": "Moved to", "r-moved-from": "Moved from", - "r-archived": "Moved to Recycle Bin", - "r-unarchived": "Restored from Recycle Bin", - "r-a-card": "a card", + "r-archived": "Enviado para a lixeira", + "r-unarchived": "Restaurado da lixeira", + "r-a-card": "um cartão", "r-when-a-label-is": "When a label is", "r-when-the-label-is": "When the label is", "r-list-name": "List name", @@ -558,53 +558,54 @@ "r-made-incomplete": "Made incomplete", "r-when-a-item": "When a checklist item is", "r-when-the-item": "When the checklist item", - "r-checked": "Checked", - "r-unchecked": "Unchecked", + "r-checked": "Marcado", + "r-unchecked": "Desmarcado", "r-move-card-to": "Move card to", "r-top-of": "Top of", "r-bottom-of": "Bottom of", "r-its-list": "its list", "r-archive": "Mover para a lixeira", "r-unarchive": "Restore from Recycle Bin", - "r-card": "card", + "r-card": "cartão", "r-add": "Novo", - "r-remove": "Remove", - "r-label": "label", - "r-member": "member", + "r-remove": "Remover", + "r-label": "etiqueta", + "r-member": "membro", "r-remove-all": "Remove all members from the card", "r-checklist": "checklist", - "r-check-all": "Check all", - "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", - "r-check": "Check", - "r-uncheck": "Uncheck", + "r-check-all": "Marcar todos", + "r-uncheck-all": "Desmarcar todos", + "r-items-check": "items of checklist", + "r-check": "Marcar", + "r-uncheck": "Desmarcar", "r-item": "item", - "r-of-checklist": "of checklist", - "r-send-email": "Send an email", - "r-to": "to", - "r-subject": "subject", + "r-of-checklist": "do checklist", + "r-send-email": "Enviar um e-mail", + "r-to": "para", + "r-subject": "assunto", "r-rule-details": "Rule details", "r-d-move-to-top-gen": "Move card to top of its list", "r-d-move-to-top-spec": "Move card to top of list", "r-d-move-to-bottom-gen": "Move card to bottom of its list", "r-d-move-to-bottom-spec": "Move card to bottom of list", - "r-d-send-email": "Send email", - "r-d-send-email-to": "to", - "r-d-send-email-subject": "subject", - "r-d-send-email-message": "message", - "r-d-archive": "Move card to Recycle Bin", - "r-d-unarchive": "Restore card from Recycle Bin", - "r-d-add-label": "Add label", - "r-d-remove-label": "Remove label", - "r-d-add-member": "Add member", - "r-d-remove-member": "Remove member", - "r-d-remove-all-member": "Remove all member", - "r-d-check-all": "Check all items of a list", - "r-d-uncheck-all": "Uncheck all items of a list", - "r-d-check-one": "Check item", - "r-d-uncheck-one": "Uncheck item", - "r-d-check-of-list": "of checklist", - "r-d-add-checklist": "Add checklist", - "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-d-send-email": "Enviar e-mail", + "r-d-send-email-to": "para", + "r-d-send-email-subject": "assunto", + "r-d-send-email-message": "mensagem", + "r-d-archive": "Enviar cartão para a lixeira", + "r-d-unarchive": "Restaurar cartão da lixeira", + "r-d-add-label": "Adicionar etiqueta", + "r-d-remove-label": "Remover etiqueta", + "r-d-add-member": "Adicionar membro", + "r-d-remove-member": "Remover membro", + "r-d-remove-all-member": "Remover todos os membros", + "r-d-check-all": "Marcar todos os itens de uma lista", + "r-d-uncheck-all": "Desmarcar todos os itens de uma lista", + "r-d-check-one": "Marcar item", + "r-d-uncheck-one": "Desmarcar item", + "r-d-check-of-list": "do checklist", + "r-d-add-checklist": "Adicionar checklist", + "r-d-remove-checklist": "Remover checklist", + "r-when-a-card-is-moved": "Quando um cartão é movido de outra lista", + "r-back": "Voltar" }
\ No newline at end of file diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 986efb39..e4b17726 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 6ece0bcc..0ce0d83c 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Înapoi" }
\ No newline at end of file diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index d501d77e..197957c5 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" }
\ No newline at end of file diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 968b6a18..df740b3d 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Nazad" }
\ No newline at end of file diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 670f6844..935f554b 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Tillbaka" }
\ No newline at end of file diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 07686e88..770b7d66 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Back" }
\ No newline at end of file diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 3227dd34..a07806a4 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "ย้อนกลับ" }
\ No newline at end of file diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index e6b5e275..ba793344 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Geri" }
\ No newline at end of file diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 0fc8265e..47422a57 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Назад" }
\ No newline at end of file diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index be1a166e..a71693b6 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "Trở Lại" }
\ No newline at end of file diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 7f49807f..274c2a38 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "返回" }
\ No newline at end of file diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 89ea22e5..4bc60d39 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -532,7 +532,7 @@ "r-add-rule": "Add rule", "r-view-rule": "View rule", "r-delete-rule": "Delete rule", - "r-new-rule-name": "Add new rule", + "r-new-rule-name": "New rule title", "r-no-rules": "No rules", "r-when-a-card-is": "When a card is", "r-added-to": "Added to", @@ -575,7 +575,7 @@ "r-checklist": "checklist", "r-check-all": "Check all", "r-uncheck-all": "Uncheck all", - "r-item-check": "Items of checklist", + "r-items-check": "items of checklist", "r-check": "Check", "r-uncheck": "Uncheck", "r-item": "item", @@ -606,5 +606,6 @@ "r-d-check-of-list": "of checklist", "r-d-add-checklist": "Add checklist", "r-d-remove-checklist": "Remove checklist", - "r-when-a-card-is-moved": "When a card is moved to another list" + "r-when-a-card-is-moved": "When a card is moved to another list", + "r-back": "返回" }
\ No newline at end of file diff --git a/models/checklistItems.js b/models/checklistItems.js index 7132bc7c..c85c0260 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -118,7 +118,7 @@ function publishCheckActivity(userId, doc){ Activities.insert(act); } -function publishChekListCompleted(userId, doc, fieldNames, modifier){ +function publishChekListCompleted(userId, doc){ const card = Cards.findOne(doc.cardId); const boardId = card.boardId; const checklistId = doc.checklistId; @@ -130,13 +130,13 @@ function publishChekListCompleted(userId, doc, fieldNames, modifier){ cardId: doc.cardId, boardId, checklistId: doc.checklistId, - checklistName:checkList.title, + checklistName: checkList.title, }; Activities.insert(act); } } -function publishChekListUncompleted(userId, doc, fieldNames, modifier){ +function publishChekListUncompleted(userId, doc){ const card = Cards.findOne(doc.cardId); const boardId = card.boardId; const checklistId = doc.checklistId; @@ -148,7 +148,7 @@ function publishChekListUncompleted(userId, doc, fieldNames, modifier){ cardId: doc.cardId, boardId, checklistId: doc.checklistId, - checklistName:checkList.title, + checklistName: checkList.title, }; Activities.insert(act); } @@ -160,13 +160,13 @@ if (Meteor.isServer) { ChecklistItems._collection._ensureIndex({ checklistId: 1 }); }); - ChecklistItems.after.update((userId, doc, fieldNames, modifier) => { + ChecklistItems.after.update((userId, doc, fieldNames) => { publishCheckActivity(userId, doc); - publishChekListCompleted(userId, doc, fieldNames, modifier); + publishChekListCompleted(userId, doc, fieldNames); }); - ChecklistItems.before.update((userId, doc, fieldNames, modifier) => { - publishChekListUncompleted(userId, doc, fieldNames, modifier); + ChecklistItems.before.update((userId, doc, fieldNames) => { + publishChekListUncompleted(userId, doc, fieldNames); }); diff --git a/models/wekanCreator.js b/models/wekanCreator.js index b018b06d..59d0cfd5 100644 --- a/models/wekanCreator.js +++ b/models/wekanCreator.js @@ -510,7 +510,7 @@ export class WekanCreator { } createTriggers(wekanTriggers, boardId) { - wekanTriggers.forEach((trigger, ruleIndex) => { + wekanTriggers.forEach((trigger) => { if (trigger.hasOwnProperty('labelId')) { trigger.labelId = this.labels[trigger.labelId]; } @@ -525,7 +525,7 @@ export class WekanCreator { } createActions(wekanActions, boardId) { - wekanActions.forEach((action, ruleIndex) => { + wekanActions.forEach((action) => { if (action.hasOwnProperty('labelId')) { action.labelId = this.labels[action.labelId]; } @@ -540,7 +540,7 @@ export class WekanCreator { } createRules(wekanRules, boardId) { - wekanRules.forEach((rule, ruleIndex) => { + wekanRules.forEach((rule) => { // Create the rule rule.boardId = boardId; rule.triggerId = this.triggers[rule.triggerId]; diff --git a/openshift/wekan.yml b/openshift/wekan.yml index 0bc96ce8..9ccdf8c0 100644 --- a/openshift/wekan.yml +++ b/openshift/wekan.yml @@ -319,7 +319,6 @@ parameters: - description: The OpenShift Namespace where the ImageStream resides. displayName: Namespace name: NAMESPACE - value: openshift - description: The name of the OpenShift Service exposed for the database. displayName: Database Service Name name: DATABASE_SERVICE_NAME @@ -359,7 +358,7 @@ parameters: required: true value: '3.2' - name: WEKAN_SERVICE_NAME - displayName: WeKan Service Name + displayName: Wekan Service Name value: wekan required: true - name: WEKAN_IMAGE @@ -367,8 +366,3 @@ parameters: value: quay.io/wekan/wekan:latest description: The metabase docker image to use required: true -- name: WEKAN_SERVICE_NAME - displayName: WeKan Service Name - value: wekan - required: true - diff --git a/server/rulesHelper.js b/server/rulesHelper.js index e9139933..833092d0 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -3,7 +3,9 @@ RulesHelper = { const matchingRules = this.findMatchingRules(activity); for(let i = 0; i< matchingRules.length; i++){ const action = matchingRules[i].getAction(); - this.performAction(activity, action); + if(action !== undefined){ + this.performAction(activity, action); + } } }, findMatchingRules(activity){ @@ -16,7 +18,12 @@ RulesHelper = { const matchingTriggers = Triggers.find(matchingMap); const matchingRules = []; matchingTriggers.forEach(function(trigger){ - matchingRules.push(trigger.getRule()); + const rule = trigger.getRule(); + // Check that for some unknown reason there are some leftover triggers + // not connected to any rules + if(rule !== undefined){ + matchingRules.push(trigger.getRule()); + } }); return matchingRules; }, @@ -65,10 +72,10 @@ RulesHelper = { const emailSubject = action.emailSubject; try { Email.send({ - to, + emailTo, from: Accounts.emailTemplates.from, - subject, - text, + emailSubject, + emailMsg, }); } catch (e) { return; |