From c3037b155fc0de1ef44d1d1c1fc65c25790ca3ad Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 17 Jun 2018 22:46:03 +0300 Subject: Added subtasks model and APIs for it --- .eslintrc.json | 1 + models/subtasks.js | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 models/subtasks.js diff --git a/.eslintrc.json b/.eslintrc.json index 255e00ba..1adaa623 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -134,6 +134,7 @@ "Announcements": true, "Swimlanes": true, "ChecklistItems": true, + "Subtasks": true, "Npm": true } } diff --git a/models/subtasks.js b/models/subtasks.js new file mode 100644 index 00000000..6c42072e --- /dev/null +++ b/models/subtasks.js @@ -0,0 +1,139 @@ +Subtasks = new Mongo.Collection('subtasks'); + +Subtasks.attachSchema(new SimpleSchema({ + title: { + type: String, + }, + sort: { + type: Number, + decimal: true, + }, + isFinished: { + type: Boolean, + defaultValue: false, + }, + cardId: { + type: String, + }, +})); + +Subtasks.allow({ + insert(userId, doc) { + return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); + }, + update(userId, doc) { + return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); + }, + remove(userId, doc) { + return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); + }, + fetch: ['userId', 'cardId'], +}); + +Subtasks.before.insert((userId, doc) => { + if (!doc.userId) { + doc.userId = userId; + } +}); + +// Mutations +Subtasks.mutations({ + setTitle(title) { + return { $set: { title } }; + }, + toggleItem() { + return { $set: { isFinished: !this.isFinished } }; + }, + move(sortIndex) { + const mutatedFields = { + sort: sortIndex, + }; + + return {$set: mutatedFields}; + }, +}); + +// Activities helper +function itemCreation(userId, doc) { + const card = Cards.findOne(doc.cardId); + const boardId = card.boardId; + Activities.insert({ + userId, + activityType: 'addSubtaskItem', + cardId: doc.cardId, + boardId, + subtaskItemId: doc._id, + }); +} + +function itemRemover(userId, doc) { + Activities.remove({ + subtaskItemId: doc._id, + }); +} + +// Activities +if (Meteor.isServer) { + Meteor.startup(() => { + Subtasks._collection._ensureIndex({ cardId: 1 }); + }); + + Subtasks.after.insert((userId, doc) => { + itemCreation(userId, doc); + }); + + Subtasks.after.remove((userId, doc) => { + itemRemover(userId, doc); + }); +} + +// APIs +if (Meteor.isServer) { + JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { + Authentication.checkUserId( req.userId); + const paramItemId = req.params.itemId; + const subtaskItem = Subtasks.findOne({ _id: paramItemId }); + if (subtaskItem) { + JsonRoutes.sendResult(res, { + code: 200, + data: subtaskItem, + }); + } else { + JsonRoutes.sendResult(res, { + code: 500, + }); + } + }); + + JsonRoutes.add('PUT', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { + Authentication.checkUserId( req.userId); + + const paramItemId = req.params.itemId; + + if (req.body.hasOwnProperty('isFinished')) { + Subtasks.direct.update({_id: paramItemId}, {$set: {isFinished: req.body.isFinished}}); + } + if (req.body.hasOwnProperty('title')) { + Subtasks.direct.update({_id: paramItemId}, {$set: {title: req.body.title}}); + } + + JsonRoutes.sendResult(res, { + code: 200, + data: { + _id: paramItemId, + }, + }); + }); + + JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { + Authentication.checkUserId( req.userId); + const paramItemId = req.params.itemId; + Subtasks.direct.remove({ _id: paramItemId }); + JsonRoutes.sendResult(res, { + code: 200, + data: { + _id: paramItemId, + }, + }); + }); +} -- cgit v1.2.3-1-g7c22 From b627ced605f0ab98eb2977420da954f31df4f592 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 17 Jun 2018 22:55:01 +0300 Subject: Some inspiration from checklists to subtasks --- models/subtasks.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/models/subtasks.js b/models/subtasks.js index 6c42072e..e842d11d 100644 --- a/models/subtasks.js +++ b/models/subtasks.js @@ -4,6 +4,29 @@ Subtasks.attachSchema(new SimpleSchema({ title: { type: String, }, + startAt: { // this is a predicted time + type: Date, + optional: true, + }, + endAt: { // this is a predicted time + type: Date, + optional: true, + }, + finishedAt: { // The date & time when it is marked as being done + type: Date, + optional: true, + }, + createdAt: { + type: Date, + denyUpdate: false, + autoValue() { // eslint-disable-line consistent-return + if (this.isInsert) { + return new Date(); + } else { + this.unset(); + } + }, + }, sort: { type: Number, decimal: true, @@ -17,6 +40,16 @@ Subtasks.attachSchema(new SimpleSchema({ }, })); +Subtasks.helpers({ + isFinished() { + return 0 !== this.itemCount() && this.itemCount() === this.finishedCount(); + }, + itemIndex(itemId) { + const items = self.findOne({_id : this._id}).items; + return _.pluck(items, '_id').indexOf(itemId); + }, +}); + Subtasks.allow({ insert(userId, doc) { return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); @@ -31,6 +64,7 @@ Subtasks.allow({ }); Subtasks.before.insert((userId, doc) => { + doc.createdAt = new Date(); if (!doc.userId) { doc.userId = userId; } -- cgit v1.2.3-1-g7c22 From d59583915cca24d53a11251c54ca7caf6b5edb4e Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Mon, 18 Jun 2018 23:25:56 +0300 Subject: Initial implementation for subtasks --- client/components/cards/cardDetails.jade | 3 + client/components/cards/cardDetails.js | 56 +++++++---- client/components/cards/checklists.jade | 5 +- client/components/cards/checklists.js | 4 +- client/components/cards/subtasks.jade | 96 ++++++++++++++++++ client/components/cards/subtasks.js | 166 +++++++++++++++++++++++++++++++ client/components/cards/subtasks.styl | 139 ++++++++++++++++++++++++++ i18n/en.i18n.json | 5 + models/activities.js | 3 + models/cards.js | 24 +++++ models/export.js | 2 + models/subtasks.js | 8 +- server/publications/boards.js | 1 + 13 files changed, 478 insertions(+), 34 deletions(-) create mode 100644 client/components/cards/subtasks.jade create mode 100644 client/components/cards/subtasks.js create mode 100644 client/components/cards/subtasks.styl diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index aa4829a9..bc0ce45c 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -144,6 +144,9 @@ template(name="cardDetails") hr +checklists(cardId = _id) + hr + +subtasks(cardId = _id) + hr h3 i.fa.fa-paperclip diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 72ed678b..22dacb70 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -364,6 +364,20 @@ BlazeComponent.extendComponent({ }, }).register('boardsAndLists'); +function cloneCheckList(_id, checklist) { + 'use strict'; + const checklistId = checklist._id; + checklist.cardId = _id; + checklist._id = null; + const newChecklistId = Checklists.insert(checklist); + ChecklistItems.find({checklistId}).forEach(function(item) { + item._id = null; + item.checklistId = newChecklistId; + item.cardId = _id; + ChecklistItems.insert(item); + }); +} + Template.copyCardPopup.events({ 'click .js-done'() { const card = Cards.findOne(Session.get('currentCard')); @@ -392,19 +406,18 @@ Template.copyCardPopup.events({ // copy checklists let cursor = Checklists.find({cardId: oldId}); + cursor.forEach(function() { + cloneCheckList(_id, arguments[0]); + }); + + // copy subtasks + cursor = Subtasks.find({cardId: oldId}); cursor.forEach(function() { 'use strict'; - const checklist = arguments[0]; - const checklistId = checklist._id; - checklist.cardId = _id; - checklist._id = null; - const newChecklistId = Checklists.insert(checklist); - ChecklistItems.find({checklistId}).forEach(function(item) { - item._id = null; - item.checklistId = newChecklistId; - item.cardId = _id; - ChecklistItems.insert(item); - }); + const subtask = arguments[0]; + subtask.cardId = _id; + subtask._id = null; + /* const newSubtaskId = */ Subtasks.insert(subtask); }); // copy card comments @@ -453,19 +466,18 @@ Template.copyChecklistToManyCardsPopup.events({ // copy checklists let cursor = Checklists.find({cardId: oldId}); + cursor.forEach(function() { + cloneCheckList(_id, arguments[0]); + }); + + // copy subtasks + cursor = Subtasks.find({cardId: oldId}); cursor.forEach(function() { 'use strict'; - const checklist = arguments[0]; - const checklistId = checklist._id; - checklist.cardId = _id; - checklist._id = null; - const newChecklistId = Checklists.insert(checklist); - ChecklistItems.find({checklistId}).forEach(function(item) { - item._id = null; - item.checklistId = newChecklistId; - item.cardId = _id; - ChecklistItems.insert(item); - }); + const subtask = arguments[0]; + subtask.cardId = _id; + subtask._id = null; + /* const newSubtaskId = */ Subtasks.insert(subtask); }); // copy card comments diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index ae680bd5..7678f524 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -27,7 +27,6 @@ template(name="checklistDetail") if canModifyCard a.js-delete-checklist.toggle-delete-checklist-dialog {{_ "delete"}}... - span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}} if canModifyCard h2.title.js-open-inlined-form.is-editable +viewer @@ -75,7 +74,7 @@ template(name="checklistItems") +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist) +editChecklistItemForm(type = 'item' item = item checklist = checklist) else - +itemDetail(item = item checklist = checklist) + +cjecklistItemDetail(item = item checklist = checklist) if canModifyCard +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist) +addChecklistItemForm @@ -84,7 +83,7 @@ template(name="checklistItems") i.fa.fa-plus | {{_ 'add-checklist-item'}}... -template(name='itemDetail') +template(name='cjecklistItemDetail') .js-checklist-item.checklist-item if canModifyCard .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 1f05aded..a62e493e 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -204,7 +204,7 @@ Template.checklistDeleteDialog.onDestroyed(() => { $cardDetails.animate( { scrollTop: this.scrollState.position }); }); -Template.itemDetail.helpers({ +Template.cjecklistItemDetail.helpers({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, @@ -223,4 +223,4 @@ BlazeComponent.extendComponent({ 'click .js-checklist-item .check-box': this.toggleItem, }]; }, -}).register('itemDetail'); +}).register('cjecklistItemDetail'); diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade new file mode 100644 index 00000000..378d7a46 --- /dev/null +++ b/client/components/cards/subtasks.jade @@ -0,0 +1,96 @@ +template(name="subtasks") + h3 {{_ 'subtasks'}} + if toggleDeleteDialog.get + .board-overlay#card-details-overlay + +subtaskDeleteDialog(subtasks = subtasksToDelete) + + + .card-subtasks-items + each subtasks in currentCard.subtasks + +subtasksDetail(subtasks = subtasks) + + if canModifyCard + +inlinedForm(autoclose=false classNames="js-add-subtask" cardId = cardId) + +addSubtaskItemForm + else + a.js-open-inlined-form + i.fa.fa-plus + | {{_ 'add-subtask'}}... + +template(name="subtasksDetail") + .js-subtasks.subtasks + +inlinedForm(classNames="js-edit-subtasks-title" subtasks = subtasks) + +editsubtasksItemForm(subtasks = subtasks) + else + .subtasks-title + span + if canModifyCard + a.js-delete-subtasks.toggle-delete-subtasks-dialog {{_ "delete"}}... + + if canModifyCard + h2.title.js-open-inlined-form.is-editable + +viewer + = subtasks.title + else + h2.title + +viewer + = subtasks.title + +template(name="subtaskDeleteDialog") + .js-confirm-subtasks-delete + p + i(class="fa fa-exclamation-triangle" aria-hidden="true") + p + | {{_ 'confirm-subtask-delete-dialog'}} + span {{subtasks.title}} + | ? + .js-subtasks-delete-buttons + button.confirm-subtasks-delete(type="button") {{_ 'delete'}} + button.toggle-delete-subtasks-dialog(type="button") {{_ 'cancel'}} + +template(name="addSubtaskItemForm") + textarea.js-add-subtask-item(rows='1' autofocus) + .edit-controls.clearfix + button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}} + a.fa.fa-times-thin.js-close-inlined-form + +template(name="editsubtasksItemForm") + textarea.js-edit-subtasks-item(rows='1' autofocus) + if $eq type 'item' + = item.title + else + = subtasks.title + .edit-controls.clearfix + button.primary.confirm.js-submit-edit-subtasks-item-form(type="submit") {{_ 'save'}} + a.fa.fa-times-thin.js-close-inlined-form + span(title=createdAt) {{ moment createdAt }} + if canModifyCard + a.js-delete-subtasks-item {{_ "delete"}}... + +template(name="subtasksItems") + .subtasks-items.js-subtasks-items + each item in subtasks.items + +inlinedForm(classNames="js-edit-subtasks-item" item = item subtasks = subtasks) + +editsubtasksItemForm(type = 'item' item = item subtasks = subtasks) + else + +subtaskItemDetail(item = item subtasks = subtasks) + if canModifyCard + +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks) + +addSubtaskItemForm + else + a.add-subtask-item.js-open-inlined-form + i.fa.fa-plus + | {{_ 'add-subtask-item'}}... + +template(name='subtaskItemDetail') + .js-subtasks-item.subtasks-item + if canModifyCard + .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") + .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title + else + .materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") + .item-title(class="{{#if item.isFinished }}is-checked{{/if}}") + +viewer + = item.title diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js new file mode 100644 index 00000000..a611ae26 --- /dev/null +++ b/client/components/cards/subtasks.js @@ -0,0 +1,166 @@ +const { calculateIndexData } = Utils; + +function initSorting(items) { + items.sortable({ + tolerance: 'pointer', + helper: 'clone', + items: '.js-subtasks-item:not(.placeholder)', + connectWith: '.js-subtasks-items', + appendTo: '.board-canvas', + distance: 7, + placeholder: 'subtasks-item placeholder', + scroll: false, + start(evt, ui) { + ui.placeholder.height(ui.helper.height()); + EscapeActions.executeUpTo('popup-close'); + }, + stop(evt, ui) { + const parent = ui.item.parents('.js-subtasks-items'); + const subtasksId = Blaze.getData(parent.get(0)).subtasks._id; + let prevItem = ui.item.prev('.js-subtasks-item').get(0); + if (prevItem) { + prevItem = Blaze.getData(prevItem).item; + } + let nextItem = ui.item.next('.js-subtasks-item').get(0); + if (nextItem) { + nextItem = Blaze.getData(nextItem).item; + } + const nItems = 1; + const sortIndex = calculateIndexData(prevItem, nextItem, nItems); + const subtasksDomElement = ui.item.get(0); + const subtasksData = Blaze.getData(subtasksDomElement); + const subtasksItem = subtasksData.item; + + items.sortable('cancel'); + + subtasksItem.move(subtasksId, sortIndex.base); + }, + }); +} + +BlazeComponent.extendComponent({ + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, +}).register('subtasksDetail'); + +BlazeComponent.extendComponent({ + + addSubtask(event) { + event.preventDefault(); + const textarea = this.find('textarea.js-add-subtask-item'); + const title = textarea.value.trim(); + const cardId = this.currentData().cardId; + const card = Cards.findOne(cardId); + + if (title) { + Subtasks.insert({ + cardId, + title, + sort: card.subtasks().count(), + }); + setTimeout(() => { + this.$('.add-subtask-item').last().click(); + }, 100); + } + textarea.value = ''; + textarea.focus(); + }, + + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, + + deleteSubtask() { + const subtasks = this.currentData().subtasks; + if (subtasks && subtasks._id) { + Subtasks.remove(subtasks._id); + this.toggleDeleteDialog.set(false); + } + }, + + editSubtask(event) { + event.preventDefault(); + const textarea = this.find('textarea.js-edit-subtasks-item'); + const title = textarea.value.trim(); + const subtasks = this.currentData().subtasks; + subtasks.setTitle(title); + }, + + onCreated() { + this.toggleDeleteDialog = new ReactiveVar(false); + this.subtasksToDelete = null; //Store data context to pass to subtaskDeleteDialog template + }, + + pressKey(event) { + //If user press enter key inside a form, submit it + //Unless the user is also holding down the 'shift' key + if (event.keyCode === 13 && !event.shiftKey) { + event.preventDefault(); + const $form = $(event.currentTarget).closest('form'); + $form.find('button[type=submit]').click(); + } + }, + + events() { + const events = { + 'click .toggle-delete-subtasks-dialog'(event) { + if($(event.target).hasClass('js-delete-subtasks')){ + this.subtasksToDelete = this.currentData().subtasks; //Store data context + } + this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get()); + }, + }; + + return [{ + ...events, + 'submit .js-add-subtask': this.addSubtask, + 'submit .js-edit-subtasks-title': this.editSubtask, + 'click .confirm-subtasks-delete': this.deleteSubtask, + keydown: this.pressKey, + }]; + }, +}).register('subtasks'); + +Template.subtaskDeleteDialog.onCreated(() => { + const $cardDetails = this.$('.card-details'); + this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position + top: false, //required for smooth scroll animation + }; + //Callback's purpose is to only prevent scrolling after animation is complete + $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; }); + + //Prevent scrolling while dialog is open + $cardDetails.on('scroll', () => { + if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll + $cardDetails.scrollTop(0); + } + }); +}); + +Template.subtaskDeleteDialog.onDestroyed(() => { + const $cardDetails = this.$('.card-details'); + $cardDetails.off('scroll'); //Reactivate scrolling + $cardDetails.animate( { scrollTop: this.scrollState.position }); +}); + +Template.subtaskItemDetail.helpers({ + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, +}); + +BlazeComponent.extendComponent({ + toggleItem() { + const subtasks = this.currentData().subtasks; + const item = this.currentData().item; + if (subtasks && item && item._id) { + item.toggleItem(); + } + }, + events() { + return [{ + 'click .js-subtasks-item .check-box': this.toggleItem, + }]; + }, +}).register('subtaskItemDetail'); diff --git a/client/components/cards/subtasks.styl b/client/components/cards/subtasks.styl new file mode 100644 index 00000000..2d18407c --- /dev/null +++ b/client/components/cards/subtasks.styl @@ -0,0 +1,139 @@ +.js-add-subtask + color: #8c8c8c + +textarea.js-add-subtask-item, textarea.js-edit-subtasks-item + overflow: hidden + word-wrap: break-word + resize: none + height: 34px + +.delete-text + color: #8c8c8c + text-decoration: underline + word-wrap: break-word + float: right + padding-top: 6px + &:hover + color: inherit + +.subtasks-title + .checkbox + float: left + width: 30px + height 30px + font-size: 18px + line-height: 30px + + .title + font-size: 18px + line-height: 25px + + .subtasks-stat + margin: 0 0.5em + float: right + padding-top: 6px + &.is-finished + color: #3cb500 + + .js-delete-subtasks + @extends .delete-text + + +.js-confirm-subtasks-delete + background-color: darken(white, 3%) + position: absolute + float: left; + width: 60% + margin-top: 0 + margin-left: 13% + padding-bottom: 2% + padding-left: 3% + padding-right: 3% + z-index: 17 + border-radius: 3px + + p + position: relative + margin-top: 3% + width: 100% + text-align: center + span + font-weight: bold + + i + font-size: 2em + + .js-subtasks-delete-buttons + position: relative + padding: left 2% right 2% + .confirm-subtasks-delete + margin-left: 12% + float: left + .toggle-delete-subtasks-dialog + margin-right: 12% + float: right + +#card-details-overlay + top: 0 + bottom: -600px + right: 0 + +.subtasks + background: darken(white, 3%) + + &.placeholder + background: darken(white, 20%) + border-radius: 2px + + &.ui-sortable-helper + box-shadow: -2px 2px 8px rgba(0, 0, 0, .3), + 0 0 1px rgba(0, 0, 0, .5) + transform: rotate(4deg) + cursor: grabbing + + +.subtasks-item + margin: 0 0 0 0.1em + line-height: 18px + font-size: 1.1em + margin-top: 3px + display: flex + background: darken(white, 3%) + + &.placeholder + background: darken(white, 20%) + border-radius: 2px + + &.ui-sortable-helper + box-shadow: -2px 2px 8px rgba(0, 0, 0, .3), + 0 0 1px rgba(0, 0, 0, .5) + transform: rotate(4deg) + cursor: grabbing + + &:hover + background-color: darken(white, 8%) + + .check-box + margin: 0.1em 0 0 0; + &.is-checked + border-bottom: 2px solid #3cb500 + border-right: 2px solid #3cb500 + + .item-title + flex: 1 + padding-left: 10px; + &.is-checked + color: #8c8c8c + font-style: italic + & .viewer + p + margin-bottom: 2px + +.js-delete-subtasks-item + margin: 0 0 0.5em 1.33em + @extends .delete-text + padding: 12px 0 0 0 + +.add-subtask-item + margin: 0.2em 0 0.5em 1.33em + display: inline-block diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 83b5caed..17d0ff71 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -140,6 +143,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -162,6 +166,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask", "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", diff --git a/models/activities.js b/models/activities.js index f64b53f8..1ff0a299 100644 --- a/models/activities.js +++ b/models/activities.js @@ -44,6 +44,9 @@ Activities.helpers({ checklistItem() { return ChecklistItems.findOne(this.checklistItemId); }, + subtasks() { + return Subtasks.findOne(this.subtaskId); + }, customField() { return CustomFields.findOne(this.customFieldId); }, diff --git a/models/cards.js b/models/cards.js index 00ec14c2..6edffb79 100644 --- a/models/cards.js +++ b/models/cards.js @@ -215,6 +215,27 @@ Cards.helpers({ return this.checklistItemCount() !== 0; }, + subtasks() { + return Subtasks.find({cardId: this._id}, {sort: { sort: 1 } }); + }, + + subtasksCount() { + return Subtasks.find({cardId: this._id}).count(); + }, + + subtasksFinishedCount() { + return Subtasks.find({cardId: this._id, isFinished: true}).count(); + }, + + subtasksFinished() { + const finishCount = this.subtasksFinishedCount(); + return finishCount > 0 && this.subtasksCount() === finishCount; + }, + + hasSubtasks() { + return this.subtasksCount() !== 0; + }, + customFieldIndex(customFieldId) { return _.pluck(this.customFields, '_id').indexOf(customFieldId); }, @@ -513,6 +534,9 @@ function cardRemover(userId, doc) { Checklists.remove({ cardId: doc._id, }); + Subtasks.remove({ + cardId: doc._id, + }); CardComments.remove({ cardId: doc._id, }); diff --git a/models/export.js b/models/export.js index aff66801..778633f9 100644 --- a/models/export.js +++ b/models/export.js @@ -58,9 +58,11 @@ class Exporter { result.activities = Activities.find(byBoard, noBoardId).fetch(); result.checklists = []; result.checklistItems = []; + result.subtaskItems = []; result.cards.forEach((card) => { result.checklists.push(...Checklists.find({ cardId: card._id }).fetch()); result.checklistItems.push(...ChecklistItems.find({ cardId: card._id }).fetch()); + result.subtaskItems.push(...Subtasks.find({ cardId: card._id }).fetch()); }); // [Old] for attachments we only export IDs and absolute url to original doc diff --git a/models/subtasks.js b/models/subtasks.js index e842d11d..3f8b932c 100644 --- a/models/subtasks.js +++ b/models/subtasks.js @@ -41,13 +41,7 @@ Subtasks.attachSchema(new SimpleSchema({ })); Subtasks.helpers({ - isFinished() { - return 0 !== this.itemCount() && this.itemCount() === this.finishedCount(); - }, - itemIndex(itemId) { - const items = self.findOne({_id : this._id}).items; - return _.pluck(items, '_id').indexOf(itemId); - }, + // ... }); Subtasks.allow({ diff --git a/server/publications/boards.js b/server/publications/boards.js index b52ac49f..5b6bf139 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -103,6 +103,7 @@ Meteor.publishRelations('board', function(boardId) { this.cursor(Attachments.find({ cardId })); this.cursor(Checklists.find({ cardId })); this.cursor(ChecklistItems.find({ cardId })); + this.cursor(Subtasks.find({ cardId })); }); if (board.members) { -- cgit v1.2.3-1-g7c22 From 5f20e56721cd23ef6b65138f1b2aa074d7f830c6 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Mon, 18 Jun 2018 23:38:41 +0300 Subject: Remove leftovers from checklist conversion --- client/components/cards/subtasks.js | 53 +------------------------------------ 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index a611ae26..e65ef518 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -1,43 +1,3 @@ -const { calculateIndexData } = Utils; - -function initSorting(items) { - items.sortable({ - tolerance: 'pointer', - helper: 'clone', - items: '.js-subtasks-item:not(.placeholder)', - connectWith: '.js-subtasks-items', - appendTo: '.board-canvas', - distance: 7, - placeholder: 'subtasks-item placeholder', - scroll: false, - start(evt, ui) { - ui.placeholder.height(ui.helper.height()); - EscapeActions.executeUpTo('popup-close'); - }, - stop(evt, ui) { - const parent = ui.item.parents('.js-subtasks-items'); - const subtasksId = Blaze.getData(parent.get(0)).subtasks._id; - let prevItem = ui.item.prev('.js-subtasks-item').get(0); - if (prevItem) { - prevItem = Blaze.getData(prevItem).item; - } - let nextItem = ui.item.next('.js-subtasks-item').get(0); - if (nextItem) { - nextItem = Blaze.getData(nextItem).item; - } - const nItems = 1; - const sortIndex = calculateIndexData(prevItem, nextItem, nItems); - const subtasksDomElement = ui.item.get(0); - const subtasksData = Blaze.getData(subtasksDomElement); - const subtasksItem = subtasksData.item; - - items.sortable('cancel'); - - subtasksItem.move(subtasksId, sortIndex.base); - }, - }); -} - BlazeComponent.extendComponent({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); @@ -151,16 +111,5 @@ Template.subtaskItemDetail.helpers({ }); BlazeComponent.extendComponent({ - toggleItem() { - const subtasks = this.currentData().subtasks; - const item = this.currentData().item; - if (subtasks && item && item._id) { - item.toggleItem(); - } - }, - events() { - return [{ - 'click .js-subtasks-item .check-box': this.toggleItem, - }]; - }, + // ... }).register('subtaskItemDetail'); -- cgit v1.2.3-1-g7c22 From f89de026c414879bdb61a0f3117e92fde6acf5aa Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 19 Jun 2018 00:25:43 +0300 Subject: Change order using drag-n-drop for subtasks --- client/components/cards/cardDetails.js | 38 ++++++++++++++++++++++++++++ client/components/cards/subtasks.jade | 46 +++++++++++++++++----------------- client/components/cards/subtasks.js | 26 +++++++++---------- client/components/cards/subtasks.styl | 16 ++++++------ 4 files changed, 82 insertions(+), 44 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 22dacb70..8d917830 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -107,6 +107,41 @@ BlazeComponent.extendComponent({ }, }); + const $subtasksDom = this.$('.card-subtasks-items'); + + $subtasksDom.sortable({ + tolerance: 'pointer', + helper: 'clone', + handle: '.subtask-title', + items: '.js-subtasks', + placeholder: 'subtasks placeholder', + distance: 7, + start(evt, ui) { + ui.placeholder.height(ui.helper.height()); + EscapeActions.executeUpTo('popup-close'); + }, + stop(evt, ui) { + let prevChecklist = ui.item.prev('.js-subtasks').get(0); + if (prevChecklist) { + prevChecklist = Blaze.getData(prevChecklist).subtask; + } + let nextChecklist = ui.item.next('.js-subtasks').get(0); + if (nextChecklist) { + nextChecklist = Blaze.getData(nextChecklist).subtask; + } + const sortIndex = calculateIndexData(prevChecklist, nextChecklist, 1); + + $subtasksDom.sortable('cancel'); + const subtask = Blaze.getData(ui.item.get(0)).subtask; + + Subtasks.update(subtask._id, { + $set: { + sort: sortIndex.base, + }, + }); + }, + }); + function userIsMember() { return Meteor.user() && Meteor.user().isBoardMember(); } @@ -116,6 +151,9 @@ BlazeComponent.extendComponent({ if ($checklistsDom.data('sortable')) { $checklistsDom.sortable('option', 'disabled', !userIsMember()); } + if ($subtasksDom.data('sortable')) { + $subtasksDom.sortable('option', 'disabled', !userIsMember()); + } }); }, diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade index 378d7a46..5bf6c7ce 100644 --- a/client/components/cards/subtasks.jade +++ b/client/components/cards/subtasks.jade @@ -2,12 +2,12 @@ template(name="subtasks") h3 {{_ 'subtasks'}} if toggleDeleteDialog.get .board-overlay#card-details-overlay - +subtaskDeleteDialog(subtasks = subtasksToDelete) + +subtaskDeleteDialog(subtask = subtaskToDelete) .card-subtasks-items - each subtasks in currentCard.subtasks - +subtasksDetail(subtasks = subtasks) + each subtask in currentCard.subtasks + +subtaskDetail(subtask = subtask) if canModifyCard +inlinedForm(autoclose=false classNames="js-add-subtask" cardId = cardId) @@ -17,36 +17,36 @@ template(name="subtasks") i.fa.fa-plus | {{_ 'add-subtask'}}... -template(name="subtasksDetail") - .js-subtasks.subtasks - +inlinedForm(classNames="js-edit-subtasks-title" subtasks = subtasks) - +editsubtasksItemForm(subtasks = subtasks) +template(name="subtaskDetail") + .js-subtasks.subtask + +inlinedForm(classNames="js-edit-subtask-title" subtask = subtask) + +editSubtaskItemForm(subtask = subtask) else - .subtasks-title + .subtask-title span if canModifyCard - a.js-delete-subtasks.toggle-delete-subtasks-dialog {{_ "delete"}}... + a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}... if canModifyCard h2.title.js-open-inlined-form.is-editable +viewer - = subtasks.title + = subtask.title else h2.title +viewer - = subtasks.title + = subtask.title template(name="subtaskDeleteDialog") - .js-confirm-subtasks-delete + .js-confirm-subtask-delete p i(class="fa fa-exclamation-triangle" aria-hidden="true") p | {{_ 'confirm-subtask-delete-dialog'}} - span {{subtasks.title}} + span {{subtask.title}} | ? - .js-subtasks-delete-buttons - button.confirm-subtasks-delete(type="button") {{_ 'delete'}} - button.toggle-delete-subtasks-dialog(type="button") {{_ 'cancel'}} + .js-subtask-delete-buttons + button.confirm-subtask-delete(type="button") {{_ 'delete'}} + button.toggle-delete-subtask-dialog(type="button") {{_ 'cancel'}} template(name="addSubtaskItemForm") textarea.js-add-subtask-item(rows='1' autofocus) @@ -54,24 +54,24 @@ template(name="addSubtaskItemForm") button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}} a.fa.fa-times-thin.js-close-inlined-form -template(name="editsubtasksItemForm") - textarea.js-edit-subtasks-item(rows='1' autofocus) +template(name="editSubtaskItemForm") + textarea.js-edit-subtask-item(rows='1' autofocus) if $eq type 'item' = item.title else - = subtasks.title + = subtask.title .edit-controls.clearfix - button.primary.confirm.js-submit-edit-subtasks-item-form(type="submit") {{_ 'save'}} + button.primary.confirm.js-submit-edit-subtask-item-form(type="submit") {{_ 'save'}} a.fa.fa-times-thin.js-close-inlined-form span(title=createdAt) {{ moment createdAt }} if canModifyCard - a.js-delete-subtasks-item {{_ "delete"}}... + a.js-delete-subtask-item {{_ "delete"}}... template(name="subtasksItems") .subtasks-items.js-subtasks-items each item in subtasks.items - +inlinedForm(classNames="js-edit-subtasks-item" item = item subtasks = subtasks) - +editsubtasksItemForm(type = 'item' item = item subtasks = subtasks) + +inlinedForm(classNames="js-edit-subtask-item" item = item subtasks = subtasks) + +editSubtaskItemForm(type = 'item' item = item subtasks = subtasks) else +subtaskItemDetail(item = item subtasks = subtasks) if canModifyCard diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index e65ef518..dc6c607f 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -2,7 +2,7 @@ BlazeComponent.extendComponent({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, -}).register('subtasksDetail'); +}).register('subtaskDetail'); BlazeComponent.extendComponent({ @@ -32,24 +32,24 @@ BlazeComponent.extendComponent({ }, deleteSubtask() { - const subtasks = this.currentData().subtasks; - if (subtasks && subtasks._id) { - Subtasks.remove(subtasks._id); + const subtask = this.currentData().subtask; + if (subtask && subtask._id) { + Subtasks.remove(subtask._id); this.toggleDeleteDialog.set(false); } }, editSubtask(event) { event.preventDefault(); - const textarea = this.find('textarea.js-edit-subtasks-item'); + const textarea = this.find('textarea.js-edit-subtask-item'); const title = textarea.value.trim(); - const subtasks = this.currentData().subtasks; - subtasks.setTitle(title); + const subtask = this.currentData().subtask; + subtask.setTitle(title); }, onCreated() { this.toggleDeleteDialog = new ReactiveVar(false); - this.subtasksToDelete = null; //Store data context to pass to subtaskDeleteDialog template + this.subtaskToDelete = null; //Store data context to pass to subtaskDeleteDialog template }, pressKey(event) { @@ -64,9 +64,9 @@ BlazeComponent.extendComponent({ events() { const events = { - 'click .toggle-delete-subtasks-dialog'(event) { - if($(event.target).hasClass('js-delete-subtasks')){ - this.subtasksToDelete = this.currentData().subtasks; //Store data context + 'click .toggle-delete-subtask-dialog'(event) { + if($(event.target).hasClass('js-delete-subtask')){ + this.subtaskToDelete = this.currentData().subtask; //Store data context } this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get()); }, @@ -75,8 +75,8 @@ BlazeComponent.extendComponent({ return [{ ...events, 'submit .js-add-subtask': this.addSubtask, - 'submit .js-edit-subtasks-title': this.editSubtask, - 'click .confirm-subtasks-delete': this.deleteSubtask, + 'submit .js-edit-subtask-title': this.editSubtask, + 'click .confirm-subtask-delete': this.deleteSubtask, keydown: this.pressKey, }]; }, diff --git a/client/components/cards/subtasks.styl b/client/components/cards/subtasks.styl index 2d18407c..5bb2d4bd 100644 --- a/client/components/cards/subtasks.styl +++ b/client/components/cards/subtasks.styl @@ -1,7 +1,7 @@ .js-add-subtask color: #8c8c8c -textarea.js-add-subtask-item, textarea.js-edit-subtasks-item +textarea.js-add-subtask-item, textarea.js-edit-subtask-item overflow: hidden word-wrap: break-word resize: none @@ -16,7 +16,7 @@ textarea.js-add-subtask-item, textarea.js-edit-subtasks-item &:hover color: inherit -.subtasks-title +.subtask-title .checkbox float: left width: 30px @@ -35,11 +35,11 @@ textarea.js-add-subtask-item, textarea.js-edit-subtasks-item &.is-finished color: #3cb500 - .js-delete-subtasks + .js-delete-subtask @extends .delete-text -.js-confirm-subtasks-delete +.js-confirm-subtask-delete background-color: darken(white, 3%) position: absolute float: left; @@ -63,13 +63,13 @@ textarea.js-add-subtask-item, textarea.js-edit-subtasks-item i font-size: 2em - .js-subtasks-delete-buttons + .js-subtask-delete-buttons position: relative padding: left 2% right 2% - .confirm-subtasks-delete + .confirm-subtask-delete margin-left: 12% float: left - .toggle-delete-subtasks-dialog + .toggle-delete-subtask-dialog margin-right: 12% float: right @@ -129,7 +129,7 @@ textarea.js-add-subtask-item, textarea.js-edit-subtasks-item p margin-bottom: 2px -.js-delete-subtasks-item +.js-delete-subtask-item margin: 0 0 0.5em 1.33em @extends .delete-text padding: 12px 0 0 0 -- cgit v1.2.3-1-g7c22 From 879a84184ff2f9b8719f5ac1e25d35e0fa5f52fb Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 19 Jun 2018 00:42:54 +0300 Subject: added ability to create a tree of cards --- models/cards.js | 5 +++++ server/migrations.js | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/models/cards.js b/models/cards.js index 6edffb79..c5d7cdf9 100644 --- a/models/cards.js +++ b/models/cards.js @@ -15,6 +15,11 @@ Cards.attachSchema(new SimpleSchema({ } }, }, + parentId: { + type: String, + optional: true, + defaultValue: '', + }, listId: { type: String, }, diff --git a/server/migrations.js b/server/migrations.js index a1a5c65a..a32c2f2d 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -258,3 +258,15 @@ Migrations.add('add-assigner-field', () => { }, noValidateMulti); }); + +Migrations.add('add-parent-field-to-cards', () => { + Cards.update({ + parentId: { + $exists: false, + }, + }, { + $set: { + parentId:'', + }, + }, noValidateMulti); +}); -- cgit v1.2.3-1-g7c22 From fd465fbb60bd92c169991e050b094904c2eec95e Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 19 Jun 2018 01:00:14 +0300 Subject: Helpers for dealing with trees of cards --- models/cards.js | 19 +++++++++++++++++++ server/migrations.js | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/models/cards.js b/models/cards.js index c5d7cdf9..1e001501 100644 --- a/models/cards.js +++ b/models/cards.js @@ -297,14 +297,33 @@ Cards.helpers({ } return true; }, + + parentCard() { + if (this.parentId === '') { + return null; + } + return Cards.findOne(this.parentId); + }, + + isTopLevel() { + return this.parentId === ''; + }, }); Cards.mutations({ + applyToKids(funct) { + Cards.find({ parentId: this._id }).forEach((card) => { + funct(card); + }); + }, + archive() { + this.applyToKids((card) => { return card.archive(); }); return {$set: {archived: true}}; }, restore() { + this.applyToKids((card) => { return card.restore(); }); return {$set: {archived: false}}; }, diff --git a/server/migrations.js b/server/migrations.js index a32c2f2d..cfc0d5ab 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -258,7 +258,6 @@ Migrations.add('add-assigner-field', () => { }, noValidateMulti); }); - Migrations.add('add-parent-field-to-cards', () => { Cards.update({ parentId: { -- cgit v1.2.3-1-g7c22 From adb7f5b2ca9e8394db314f7ff97d0d0f811c51c0 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sat, 23 Jun 2018 17:40:53 +0300 Subject: Switch from subtasks to cards in model --- models/cards.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/cards.js b/models/cards.js index 1e001501..8cf0ef65 100644 --- a/models/cards.js +++ b/models/cards.js @@ -221,15 +221,15 @@ Cards.helpers({ }, subtasks() { - return Subtasks.find({cardId: this._id}, {sort: { sort: 1 } }); + return Cards.find({parentId: this._id}, {sort: { sort: 1 } }); }, subtasksCount() { - return Subtasks.find({cardId: this._id}).count(); + return Cards.find({parentId: this._id}).count(); }, subtasksFinishedCount() { - return Subtasks.find({cardId: this._id, isFinished: true}).count(); + return Cards.find({parentId: this._id, archived: true}).count(); }, subtasksFinished() { -- cgit v1.2.3-1-g7c22 From 5a023e431504f7573723db6e0d2262ecb1fc61c5 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sat, 23 Jun 2018 23:22:38 +0300 Subject: Can add cards as subtasks --- client/components/cards/subtasks.js | 26 +++++++++++++++--- i18n/en.i18n.json | 4 ++- models/boards.js | 54 +++++++++++++++++++++++++++++++++++++ server/migrations.js | 13 +++++++++ 4 files changed, 92 insertions(+), 5 deletions(-) diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index dc6c607f..0df5d21f 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -12,13 +12,31 @@ BlazeComponent.extendComponent({ const title = textarea.value.trim(); const cardId = this.currentData().cardId; const card = Cards.findOne(cardId); + const sortIndex = -1; + const crtBoard = Boards.findOne(card.boardId); + const targetBoard = crtBoard.getDefaultSubtasksBoard(); + const listId = targetBoard.getDefaultSubtasksListId(); + const swimlaneId = Swimlanes.findOne({boardId: targetBoard._id})._id; if (title) { - Subtasks.insert({ - cardId, + const _id = Cards.insert({ title, - sort: card.subtasks().count(), + parentId: cardId, + members: [], + labelIds: [], + customFields: [], + listId, + boardId: targetBoard._id, + sort: sortIndex, + swimlaneId, }); + // In case the filter is active we need to add the newly inserted card in + // the list of exceptions -- cards that are not filtered. Otherwise the + // card will disappear instantly. + // See https://github.com/wekan/wekan/issues/80 + Filter.addException(_id); + + setTimeout(() => { this.$('.add-subtask-item').last().click(); }, 100); @@ -34,7 +52,7 @@ BlazeComponent.extendComponent({ deleteSubtask() { const subtask = this.currentData().subtask; if (subtask && subtask._id) { - Subtasks.remove(subtask._id); + Cards.remove(subtask._id); this.toggleDeleteDialog.set(false); } }, diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 17d0ff71..3a87179a 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -479,5 +479,7 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default" } diff --git a/models/boards.js b/models/boards.js index 911d82a1..6836a320 100644 --- a/models/boards.js +++ b/models/boards.js @@ -151,6 +151,16 @@ Boards.attachSchema(new SimpleSchema({ type: String, optional: true, }, + subtasksDefaultBoardId: { + type: String, + optional: true, + defaultValue: null, + }, + subtasksDefaultListId: { + type: String, + optional: true, + defaultValue: null, + }, })); @@ -284,8 +294,52 @@ Boards.helpers({ return Cards.find(query, projection); }, + // A board alwasy has another board where it deposits subtasks of thasks + // that belong to itself. + getDefaultSubtasksBoardId() { + if (this.subtasksDefaultBoardId === null) { + this.subtasksDefaultBoardId = Boards.insert({ + title: `^${this.title}^`, + permission: this.permission, + members: this.members, + color: this.color, + description: TAPi18n.__('default-subtasks-board', {board: this.title}), + }); + + Swimlanes.insert({ + title: TAPi18n.__('default'), + boardId: this.subtasksDefaultBoardId, + }); + Boards.update(this._id, {$set: { + subtasksDefaultBoardId: this.subtasksDefaultBoardId, + }}); + } + return this.subtasksDefaultBoardId; + }, + + getDefaultSubtasksBoard() { + return Boards.findOne(this.getDefaultSubtasksBoardId()); + }, + + getDefaultSubtasksListId() { + if (this.subtasksDefaultListId === null) { + this.subtasksDefaultListId = Lists.insert({ + title: TAPi18n.__('new'), + boardId: this._id, + }); + Boards.update(this._id, {$set: { + subtasksDefaultListId: this.subtasksDefaultListId, + }}); + } + return this.subtasksDefaultListId; + }, + + getDefaultSubtasksList() { + return Lists.findOne(this.getDefaultSubtasksListId()); + }, }); + Boards.mutations({ archive() { return { $set: { archived: true } }; diff --git a/server/migrations.js b/server/migrations.js index cfc0d5ab..3ab3070d 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -269,3 +269,16 @@ Migrations.add('add-parent-field-to-cards', () => { }, }, noValidateMulti); }); + +Migrations.add('add-subtasks-boards', () => { + Boards.update({ + subtasksDefaultBoardId: { + $exists: false, + }, + }, { + $set: { + subtasksDefaultBoardId: null, + subtasksDefaultListId: null, + }, + }, noValidateMulti); +}); -- cgit v1.2.3-1-g7c22 From 6ab1cbb341da44cbaffc296ea177a8cd146e5244 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sat, 23 Jun 2018 23:31:44 +0300 Subject: Take archived status into consideration for subtasks --- models/cards.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/models/cards.js b/models/cards.js index 8cf0ef65..ca0e16be 100644 --- a/models/cards.js +++ b/models/cards.js @@ -221,15 +221,30 @@ Cards.helpers({ }, subtasks() { - return Cards.find({parentId: this._id}, {sort: { sort: 1 } }); + return Cards.find({ + parentId: this._id, + archived: false, + }, {sort: { sort: 1 } }); + }, + + allSubtasks() { + return Cards.find({ + parentId: this._id, + archived: false, + }, {sort: { sort: 1 } }); }, subtasksCount() { - return Cards.find({parentId: this._id}).count(); + return Cards.find({ + parentId: this._id, + archived: false, + }).count(); }, subtasksFinishedCount() { - return Cards.find({parentId: this._id, archived: true}).count(); + return Cards.find({ + parentId: this._id, + archived: true}).count(); }, subtasksFinished() { -- cgit v1.2.3-1-g7c22 From cd36194477593f12103bc3d69e3cdd594c831099 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sat, 23 Jun 2018 23:44:45 +0300 Subject: Archive subtask instead of permanent delete --- client/components/cards/subtasks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 0df5d21f..9a6666a3 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -52,7 +52,7 @@ BlazeComponent.extendComponent({ deleteSubtask() { const subtask = this.currentData().subtask; if (subtask && subtask._id) { - Cards.remove(subtask._id); + subtask.archive(); this.toggleDeleteDialog.set(false); } }, -- cgit v1.2.3-1-g7c22 From 4ac6a507cdd3e7a4610c8961e0a9f76f945a5e6d Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 24 Jun 2018 00:21:23 +0300 Subject: Get rid of old implementation for substacks --- client/components/cards/cardDetails.js | 14 +-- models/activities.js | 2 +- models/cards.js | 6 ++ models/export.js | 2 +- models/subtasks.js | 167 --------------------------------- server/migrations.js | 13 +++ server/publications/boards.js | 2 +- 7 files changed, 29 insertions(+), 177 deletions(-) delete mode 100644 models/subtasks.js diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 8d917830..4731e448 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -136,7 +136,7 @@ BlazeComponent.extendComponent({ Subtasks.update(subtask._id, { $set: { - sort: sortIndex.base, + subtaskSort: sortIndex.base, }, }); }, @@ -449,13 +449,13 @@ Template.copyCardPopup.events({ }); // copy subtasks - cursor = Subtasks.find({cardId: oldId}); + cursor = Cards.find({parentId: oldId}); cursor.forEach(function() { 'use strict'; const subtask = arguments[0]; - subtask.cardId = _id; + subtask.parentId = _id; subtask._id = null; - /* const newSubtaskId = */ Subtasks.insert(subtask); + /* const newSubtaskId = */ Cards.insert(subtask); }); // copy card comments @@ -509,13 +509,13 @@ Template.copyChecklistToManyCardsPopup.events({ }); // copy subtasks - cursor = Subtasks.find({cardId: oldId}); + cursor = Cards.find({parentId: oldId}); cursor.forEach(function() { 'use strict'; const subtask = arguments[0]; - subtask.cardId = _id; + subtask.parentId = _id; subtask._id = null; - /* const newSubtaskId = */ Subtasks.insert(subtask); + /* const newSubtaskId = */ Cards.insert(subtask); }); // copy card comments diff --git a/models/activities.js b/models/activities.js index 1ff0a299..5b54759c 100644 --- a/models/activities.js +++ b/models/activities.js @@ -45,7 +45,7 @@ Activities.helpers({ return ChecklistItems.findOne(this.checklistItemId); }, subtasks() { - return Subtasks.findOne(this.subtaskId); + return Cards.findOne(this.subtaskId); }, customField() { return CustomFields.findOne(this.customFieldId); diff --git a/models/cards.js b/models/cards.js index ca0e16be..4ec3ea7c 100644 --- a/models/cards.js +++ b/models/cards.js @@ -127,6 +127,12 @@ Cards.attachSchema(new SimpleSchema({ type: Number, decimal: true, }, + subtaskSort: { + type: Number, + decimal: true, + defaultValue: -1, + optional: true, + }, })); Cards.allow({ diff --git a/models/export.js b/models/export.js index 778633f9..8c4c29d4 100644 --- a/models/export.js +++ b/models/export.js @@ -62,7 +62,7 @@ class Exporter { result.cards.forEach((card) => { result.checklists.push(...Checklists.find({ cardId: card._id }).fetch()); result.checklistItems.push(...ChecklistItems.find({ cardId: card._id }).fetch()); - result.subtaskItems.push(...Subtasks.find({ cardId: card._id }).fetch()); + result.subtaskItems.push(...Cards.find({ parentid: card._id }).fetch()); }); // [Old] for attachments we only export IDs and absolute url to original doc diff --git a/models/subtasks.js b/models/subtasks.js deleted file mode 100644 index 3f8b932c..00000000 --- a/models/subtasks.js +++ /dev/null @@ -1,167 +0,0 @@ -Subtasks = new Mongo.Collection('subtasks'); - -Subtasks.attachSchema(new SimpleSchema({ - title: { - type: String, - }, - startAt: { // this is a predicted time - type: Date, - optional: true, - }, - endAt: { // this is a predicted time - type: Date, - optional: true, - }, - finishedAt: { // The date & time when it is marked as being done - type: Date, - optional: true, - }, - createdAt: { - type: Date, - denyUpdate: false, - autoValue() { // eslint-disable-line consistent-return - if (this.isInsert) { - return new Date(); - } else { - this.unset(); - } - }, - }, - sort: { - type: Number, - decimal: true, - }, - isFinished: { - type: Boolean, - defaultValue: false, - }, - cardId: { - type: String, - }, -})); - -Subtasks.helpers({ - // ... -}); - -Subtasks.allow({ - insert(userId, doc) { - return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); - }, - update(userId, doc) { - return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); - }, - remove(userId, doc) { - return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId)); - }, - fetch: ['userId', 'cardId'], -}); - -Subtasks.before.insert((userId, doc) => { - doc.createdAt = new Date(); - if (!doc.userId) { - doc.userId = userId; - } -}); - -// Mutations -Subtasks.mutations({ - setTitle(title) { - return { $set: { title } }; - }, - toggleItem() { - return { $set: { isFinished: !this.isFinished } }; - }, - move(sortIndex) { - const mutatedFields = { - sort: sortIndex, - }; - - return {$set: mutatedFields}; - }, -}); - -// Activities helper -function itemCreation(userId, doc) { - const card = Cards.findOne(doc.cardId); - const boardId = card.boardId; - Activities.insert({ - userId, - activityType: 'addSubtaskItem', - cardId: doc.cardId, - boardId, - subtaskItemId: doc._id, - }); -} - -function itemRemover(userId, doc) { - Activities.remove({ - subtaskItemId: doc._id, - }); -} - -// Activities -if (Meteor.isServer) { - Meteor.startup(() => { - Subtasks._collection._ensureIndex({ cardId: 1 }); - }); - - Subtasks.after.insert((userId, doc) => { - itemCreation(userId, doc); - }); - - Subtasks.after.remove((userId, doc) => { - itemRemover(userId, doc); - }); -} - -// APIs -if (Meteor.isServer) { - JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { - Authentication.checkUserId( req.userId); - const paramItemId = req.params.itemId; - const subtaskItem = Subtasks.findOne({ _id: paramItemId }); - if (subtaskItem) { - JsonRoutes.sendResult(res, { - code: 200, - data: subtaskItem, - }); - } else { - JsonRoutes.sendResult(res, { - code: 500, - }); - } - }); - - JsonRoutes.add('PUT', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { - Authentication.checkUserId( req.userId); - - const paramItemId = req.params.itemId; - - if (req.body.hasOwnProperty('isFinished')) { - Subtasks.direct.update({_id: paramItemId}, {$set: {isFinished: req.body.isFinished}}); - } - if (req.body.hasOwnProperty('title')) { - Subtasks.direct.update({_id: paramItemId}, {$set: {title: req.body.title}}); - } - - JsonRoutes.sendResult(res, { - code: 200, - data: { - _id: paramItemId, - }, - }); - }); - - JsonRoutes.add('DELETE', '/api/boards/:boardId/cards/:cardId/subtasks/:itemId', function (req, res) { - Authentication.checkUserId( req.userId); - const paramItemId = req.params.itemId; - Subtasks.direct.remove({ _id: paramItemId }); - JsonRoutes.sendResult(res, { - code: 200, - data: { - _id: paramItemId, - }, - }); - }); -} diff --git a/server/migrations.js b/server/migrations.js index 3ab3070d..c49581f5 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -282,3 +282,16 @@ Migrations.add('add-subtasks-boards', () => { }, }, noValidateMulti); }); + +Migrations.add('add-subtasks-sort', () => { + Boards.update({ + subtaskSort: { + $exists: false, + }, + }, { + $set: { + subtaskSort: -1, + }, + }, noValidateMulti); +}); + diff --git a/server/publications/boards.js b/server/publications/boards.js index 5b6bf139..5d095c17 100644 --- a/server/publications/boards.js +++ b/server/publications/boards.js @@ -103,7 +103,7 @@ Meteor.publishRelations('board', function(boardId) { this.cursor(Attachments.find({ cardId })); this.cursor(Checklists.find({ cardId })); this.cursor(ChecklistItems.find({ cardId })); - this.cursor(Subtasks.find({ cardId })); + this.cursor(Cards.find({ parentId: cardId })); }); if (board.members) { -- cgit v1.2.3-1-g7c22 From 989b026b33508feaa6ba806a624b95a93298327c Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 24 Jun 2018 10:44:09 +0300 Subject: Can now navigate to subtask --- client/components/cards/subtasks.jade | 1 + client/components/cards/subtasks.js | 11 +++++++++++ client/components/cards/subtasks.styl | 3 +++ 3 files changed, 15 insertions(+) diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade index 5bf6c7ce..b0ef2f33 100644 --- a/client/components/cards/subtasks.jade +++ b/client/components/cards/subtasks.jade @@ -24,6 +24,7 @@ template(name="subtaskDetail") else .subtask-title span + a.js-view-subtask(title="{{ subtask.title }}") {{_ "view-it"}} if canModifyCard a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}... diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 9a6666a3..087824f7 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -88,6 +88,17 @@ BlazeComponent.extendComponent({ } this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get()); }, + 'click .js-view-subtask'(event) { + if($(event.target).hasClass('js-view-subtask')){ + const subtask = this.currentData().subtask; + const board = subtask.board(); + FlowRouter.go('card', { + boardId: board._id, + slug: board.slug, + cardId: subtask._id, + }); + } + }, }; return [{ diff --git a/client/components/cards/subtasks.styl b/client/components/cards/subtasks.styl index 5bb2d4bd..c2f09aa1 100644 --- a/client/components/cards/subtasks.styl +++ b/client/components/cards/subtasks.styl @@ -37,7 +37,10 @@ textarea.js-add-subtask-item, textarea.js-edit-subtask-item .js-delete-subtask @extends .delete-text + margin: 0 0.5em + .js-view-subtask + @extends .delete-text .js-confirm-subtask-delete background-color: darken(white, 3%) -- cgit v1.2.3-1-g7c22 From 50f170b75d9d149bd333091fb5f7ba150c245b15 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 24 Jun 2018 10:59:48 +0300 Subject: A better name for incoming subtasks --- i18n/en.i18n.json | 3 ++- models/boards.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 3a87179a..5e1a99e8 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -481,5 +481,6 @@ "boardDeletePopup-title": "Delete Board?", "delete-board": "Delete Board", "default-subtasks-board": "Subtasks for __board__ board", - "default": "Default" + "default": "Default", + "queue": "Queue" } diff --git a/models/boards.js b/models/boards.js index 6836a320..6f0f7293 100644 --- a/models/boards.js +++ b/models/boards.js @@ -324,7 +324,7 @@ Boards.helpers({ getDefaultSubtasksListId() { if (this.subtasksDefaultListId === null) { this.subtasksDefaultListId = Lists.insert({ - title: TAPi18n.__('new'), + title: TAPi18n.__('queue'), boardId: this._id, }); Boards.update(this._id, {$set: { -- cgit v1.2.3-1-g7c22 From a0c02f4a5008f9ce47a4dac811aad7efdef5cc21 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 24 Jun 2018 17:42:58 +0300 Subject: typo in renaming itemDetail to checklistItemDetail --- client/components/cards/checklists.jade | 4 ++-- client/components/cards/checklists.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 7678f524..e45e7ad9 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -74,7 +74,7 @@ template(name="checklistItems") +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist) +editChecklistItemForm(type = 'item' item = item checklist = checklist) else - +cjecklistItemDetail(item = item checklist = checklist) + +checklistItemDetail(item = item checklist = checklist) if canModifyCard +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist) +addChecklistItemForm @@ -83,7 +83,7 @@ template(name="checklistItems") i.fa.fa-plus | {{_ 'add-checklist-item'}}... -template(name='cjecklistItemDetail') +template(name='checklistItemDetail') .js-checklist-item.checklist-item if canModifyCard .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}") diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index a62e493e..519af629 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -204,7 +204,7 @@ Template.checklistDeleteDialog.onDestroyed(() => { $cardDetails.animate( { scrollTop: this.scrollState.position }); }); -Template.cjecklistItemDetail.helpers({ +Template.checklistItemDetail.helpers({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); }, @@ -223,4 +223,4 @@ BlazeComponent.extendComponent({ 'click .js-checklist-item .check-box': this.toggleItem, }]; }, -}).register('cjecklistItemDetail'); +}).register('checklistItemDetail'); -- cgit v1.2.3-1-g7c22 From aead18eb58e230ed06ac090f7ea36c64fd597992 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Sun, 24 Jun 2018 17:47:57 +0300 Subject: change all mentions of Kids => Children --- models/cards.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/cards.js b/models/cards.js index 4ec3ea7c..2563fdf8 100644 --- a/models/cards.js +++ b/models/cards.js @@ -332,19 +332,19 @@ Cards.helpers({ }); Cards.mutations({ - applyToKids(funct) { + applyToChildren(funct) { Cards.find({ parentId: this._id }).forEach((card) => { funct(card); }); }, archive() { - this.applyToKids((card) => { return card.archive(); }); + this.applyToChildren((card) => { return card.archive(); }); return {$set: {archived: true}}; }, restore() { - this.applyToKids((card) => { return card.restore(); }); + this.applyToChildren((card) => { return card.restore(); }); return {$set: {archived: false}}; }, -- cgit v1.2.3-1-g7c22 From 04745f0c2fe83f044032713e1864c5ac00d38ac9 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Mon, 25 Jun 2018 22:01:02 +0300 Subject: implement getDefaultSwimline for boards --- client/components/cards/subtasks.js | 2 +- client/components/lists/listBody.js | 2 +- models/boards.js | 12 ++++++++++++ server/migrations.js | 10 +--------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 087824f7..335eba36 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -16,7 +16,7 @@ BlazeComponent.extendComponent({ const crtBoard = Boards.findOne(card.boardId); const targetBoard = crtBoard.getDefaultSubtasksBoard(); const listId = targetBoard.getDefaultSubtasksListId(); - const swimlaneId = Swimlanes.findOne({boardId: targetBoard._id})._id; + const swimlaneId = targetBoard.getDefaultSwimline()._id; if (title) { const _id = Cards.insert({ diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js index 4bf7b369..34aeb8a8 100644 --- a/client/components/lists/listBody.js +++ b/client/components/lists/listBody.js @@ -46,7 +46,7 @@ BlazeComponent.extendComponent({ if (boardView === 'board-view-swimlanes') swimlaneId = this.parentComponent().parentComponent().data()._id; else if (boardView === 'board-view-lists') - swimlaneId = Swimlanes.findOne({boardId})._id; + swimlaneId = this.data().board().getDefaultSwimline()._id; if (title) { const _id = Cards.insert({ diff --git a/models/boards.js b/models/boards.js index 6f0f7293..a8b7191e 100644 --- a/models/boards.js +++ b/models/boards.js @@ -337,6 +337,18 @@ Boards.helpers({ getDefaultSubtasksList() { return Lists.findOne(this.getDefaultSubtasksListId()); }, + + getDefaultSwimline() { + let result = Swimlanes.findOne({boardId: this._id}); + if (result === undefined) { + Swimlanes.insert({ + title: TAPi18n.__('default'), + boardId: this._id, + }); + result = Swimlanes.findOne({boardId: this._id}); + } + return result; + }, }); diff --git a/server/migrations.js b/server/migrations.js index c49581f5..af866d13 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -154,15 +154,7 @@ Migrations.add('add-sort-checklists', () => { Migrations.add('add-swimlanes', () => { Boards.find().forEach((board) => { - const swimlane = Swimlanes.findOne({ boardId: board._id }); - let swimlaneId = ''; - if (swimlane) - swimlaneId = swimlane._id; - else - swimlaneId = Swimlanes.direct.insert({ - boardId: board._id, - title: 'Default', - }); + const swimlaneId = board.getDefaultSwimline()._id; Cards.find({ boardId: board._id }).forEach((card) => { if (!card.hasOwnProperty('swimlaneId')) { -- cgit v1.2.3-1-g7c22 From c9f70cf382707141561732a46dbd3e3e2f159e6e Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Mon, 25 Jun 2018 22:52:50 +0300 Subject: Check for null and undefined in board defaults --- models/boards.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/boards.js b/models/boards.js index a8b7191e..fce674ae 100644 --- a/models/boards.js +++ b/models/boards.js @@ -297,7 +297,7 @@ Boards.helpers({ // A board alwasy has another board where it deposits subtasks of thasks // that belong to itself. getDefaultSubtasksBoardId() { - if (this.subtasksDefaultBoardId === null) { + if ((this.subtasksDefaultBoardId === null) || (this.subtasksDefaultBoardId === undefined)) { this.subtasksDefaultBoardId = Boards.insert({ title: `^${this.title}^`, permission: this.permission, @@ -322,7 +322,7 @@ Boards.helpers({ }, getDefaultSubtasksListId() { - if (this.subtasksDefaultListId === null) { + if ((this.subtasksDefaultListId === null) || (this.subtasksDefaultListId === undefined)) { this.subtasksDefaultListId = Lists.insert({ title: TAPi18n.__('queue'), boardId: this._id, -- cgit v1.2.3-1-g7c22 From 94a52080cff14f7587c0ee837c1fca131cd6aff0 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Mon, 25 Jun 2018 23:12:20 +0300 Subject: Board level settings for subtasks --- client/components/boards/boardHeader.jade | 31 ++++++++++++++ client/components/boards/boardHeader.js | 70 +++++++++++++++++++++++++++++++ client/components/cards/cardDetails.jade | 5 ++- client/components/cards/subtasks.js | 1 + i18n/en.i18n.json | 7 +++- models/boards.js | 16 +++++++ models/cards.js | 2 +- server/migrations.js | 12 ++++++ 8 files changed, 140 insertions(+), 4 deletions(-) diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index b4ccd3b3..59691a61 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -130,6 +130,10 @@ template(name="boardMenuPopup") li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}} li: a.js-archive-board {{_ 'archive-board'}} li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}} + hr + ul.pop-over-list + li: a.js-subtask-settings {{_ 'subtask-settings'}} + if isSandstorm hr ul.pop-over-list @@ -193,6 +197,33 @@ template(name="boardChangeColorPopup") if isSelected i.fa.fa-check +template(name="boardSubtaskSettingsPopup") + form.board-subtask-settings + a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}") + .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}") + span {{_ 'show-subtasks-field'}} + label + | {{_ 'deposit-subtasks-board'}} + select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}") + each boards + if isBoardSelected + option(value=_id selected="selected") {{title}} + else + option(value=_id) {{title}} + if isNullBoardSelected + option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}} + else + option(value='null') {{_ 'custom-field-dropdown-none'}} + hr + label + | {{_ 'deposit-subtasks-list'}} + select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}") + each lists + if isListSelected + option(value=_id selected="selected") {{title}} + else + option(value=_id) {{title}} + template(name="createBoard") form label diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index b2640474..bafee9b9 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -25,6 +25,7 @@ Template.boardMenuPopup.events({ }), 'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'), 'click .js-import-board': Popup.open('chooseBoardSource'), + 'click .js-subtask-settings': Popup.open('boardSubtaskSettings'), }); Template.boardMenuPopup.helpers({ @@ -151,6 +152,75 @@ BlazeComponent.extendComponent({ }, }).register('boardChangeColorPopup'); +BlazeComponent.extendComponent({ + onCreated() { + this.currentBoard = Boards.findOne(Session.get('currentBoard')); + }, + + allowsSubtasks() { + return this.currentBoard.allowsSubtasks; + }, + + isBoardSelected() { + return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id; + }, + + isNullBoardSelected() { + return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined); + }, + + boards() { + return Boards.find({ + archived: false, + 'members.userId': Meteor.userId(), + }, { + sort: ['title'], + }); + }, + + lists() { + return Lists.find({ + boardId: this.currentBoard._id, + archived: false, + }, { + sort: ['title'], + }); + }, + + hasLists() { + return this.lists().count() > 0; + }, + + isListSelected() { + return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id; + }, + + events() { + return [{ + 'click .js-field-has-subtasks'(evt) { + evt.preventDefault(); + this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks; + this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks); + $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks); + $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks); + $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks); + }, + 'change .js-field-deposit-board'(evt) { + let value = evt.target.value; + if (value === 'null') { + value = null; + } + this.currentBoard.setSubtasksDefaultBoardId(value); + evt.preventDefault(); + }, + 'change .js-field-deposit-list'(evt) { + this.currentBoard.setSubtasksDefaultListId(evt.target.value); + evt.preventDefault(); + }, + }]; + }, +}).register('boardSubtaskSettingsPopup'); + const CreateBoard = BlazeComponent.extendComponent({ template() { return 'createBoard'; diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index bc0ce45c..789cc4b1 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -144,8 +144,9 @@ template(name="cardDetails") hr +checklists(cardId = _id) - hr - +subtasks(cardId = _id) + if currentBoard.allowsSubtasks + hr + +subtasks(cardId = _id) hr h3 diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 335eba36..9c6f265e 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -30,6 +30,7 @@ BlazeComponent.extendComponent({ sort: sortIndex, swimlaneId, }); + // In case the filter is active we need to add the newly inserted card in // the list of exceptions -- cards that are not filtered. Otherwise the // card will disappear instantly. diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 5e1a99e8..e410572f 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -482,5 +482,10 @@ "delete-board": "Delete Board", "default-subtasks-board": "Subtasks for __board__ board", "default": "Default", - "queue": "Queue" + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks:", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:" } diff --git a/models/boards.js b/models/boards.js index fce674ae..b5b0b0fc 100644 --- a/models/boards.js +++ b/models/boards.js @@ -161,6 +161,10 @@ Boards.attachSchema(new SimpleSchema({ optional: true, defaultValue: null, }, + allowsSubtasks: { + type: Boolean, + defaultValue: true, + }, })); @@ -473,6 +477,18 @@ Boards.mutations({ }, }; }, + + setAllowsSubtasks(allowsSubtasks) { + return { $set: { allowsSubtasks } }; + }, + + setSubtasksDefaultBoardId(subtasksDefaultBoardId) { + return { $set: { subtasksDefaultBoardId } }; + }, + + setSubtasksDefaultListId(subtasksDefaultListId) { + return { $set: { subtasksDefaultListId } }; + }, }); if (Meteor.isServer) { diff --git a/models/cards.js b/models/cards.js index 2563fdf8..8d7a93d0 100644 --- a/models/cards.js +++ b/models/cards.js @@ -258,7 +258,7 @@ Cards.helpers({ return finishCount > 0 && this.subtasksCount() === finishCount; }, - hasSubtasks() { + allowsSubtasks() { return this.subtasksCount() !== 0; }, diff --git a/server/migrations.js b/server/migrations.js index af866d13..c3da3221 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -287,3 +287,15 @@ Migrations.add('add-subtasks-sort', () => { }, noValidateMulti); }); +Migrations.add('add-subtasks-allowed', () => { + Boards.update({ + allowsSubtasks: { + $exists: false, + }, + }, { + $set: { + allowsSubtasks: -1, + }, + }, noValidateMulti); +}); + -- cgit v1.2.3-1-g7c22 From c0ffd6c20f2a04bd1436ea2f0953f1c3c8afe145 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 02:13:31 +0300 Subject: Show parent in card (no links, yet) --- client/components/boards/boardHeader.jade | 31 +++++++++++++++--- client/components/boards/boardHeader.js | 27 ++++++++++++++++ client/components/boards/boardHeader.styl | 19 +++++++++++ client/components/cards/cardDetails.jade | 6 ++++ client/components/cards/cardDetails.js | 8 +++++ client/components/cards/minicard.jade | 16 +++++++++- i18n/en.i18n.json | 11 +++++-- models/boards.js | 16 ++++++++++ models/cards.js | 53 +++++++++++++++++++++++++++++++ server/migrations.js | 14 +++++++- 10 files changed, 193 insertions(+), 8 deletions(-) diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 59691a61..a4abfac6 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -199,9 +199,30 @@ template(name="boardChangeColorPopup") template(name="boardSubtaskSettingsPopup") form.board-subtask-settings - a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}") - .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}") - span {{_ 'show-subtasks-field'}} + h3 {{_ 'show-parent-in-minicard'}} + a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}") + .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}") + span {{_ 'prefix-with-full-path'}} + a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}") + .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}") + span {{_ 'prefix-with-parent'}} + a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}") + .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}") + span {{_ 'subtext-with-full-path'}} + a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}") + .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}") + span {{_ 'subtext-with-parent'}} + a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}") + .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}") + span {{_ 'no-parent'}} + div + hr + + div.check-div + a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}") + .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}") + span {{_ 'show-subtasks-field'}} + label | {{_ 'deposit-subtasks-board'}} select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}") @@ -214,7 +235,9 @@ template(name="boardSubtaskSettingsPopup") option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}} else option(value='null') {{_ 'custom-field-dropdown-none'}} - hr + div + hr + label | {{_ 'deposit-subtasks-list'}} select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}") diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index bafee9b9..865bb212 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -195,6 +195,14 @@ BlazeComponent.extendComponent({ return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id; }, + presentParentTask() { + let result = this.currentBoard.presentParentTask; + if ((result === null) || (result === undefined)) { + result = 'no-parent'; + } + return result; + }, + events() { return [{ 'click .js-field-has-subtasks'(evt) { @@ -217,6 +225,25 @@ BlazeComponent.extendComponent({ this.currentBoard.setSubtasksDefaultListId(evt.target.value); evt.preventDefault(); }, + 'click .js-field-show-parent-in-minicard'(evt) { + const value = evt.target.id || $(evt.target).parent()[0].id || $(evt.target).parent()[0].parent()[0].id; + const options = [ + 'prefix-with-full-path', + 'prefix-with-parent', + 'subtext-with-full-path', + 'subtext-with-parent', + 'no-parent']; + options.forEach(function(element) { + if (element !== value) { + $(`#${element} .materialCheckBox`).toggleClass('is-checked', false); + $(`#${element}`).toggleClass('is-checked', false); + } + }); + $(`#${value} .materialCheckBox`).toggleClass('is-checked', true); + $(`#${value}`).toggleClass('is-checked', true); + this.currentBoard.setPresentParentTask(value); + evt.preventDefault(); + }, }]; }, }).register('boardSubtaskSettingsPopup'); diff --git a/client/components/boards/boardHeader.styl b/client/components/boards/boardHeader.styl index 0abdb5bd..402b4f1e 100644 --- a/client/components/boards/boardHeader.styl +++ b/client/components/boards/boardHeader.styl @@ -1,3 +1,22 @@ .integration-form padding: 5px border-bottom: 1px solid #ccc + +.flex + display: -webkit-box + display: -moz-box + display: -webkit-flex + display: -moz-flex + display: -ms-flexbox + display: flex + +.option + @extends .flex + -webkit-border-radius: 3px; + border-radius: 3px; + background: #fff; + text-decoration: none; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.2); + box-shadow: 0 1px 2px rgba(0,0,0,0.2); + margin-top: 5px; + padding: 5px; diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 789cc4b1..a5b8a2b3 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -13,6 +13,12 @@ template(name="cardDetails") = title if isWatching i.fa.fa-eye.card-details-watch + .card-details-path + each parentList + |   >   + a.js-parent-card {{title}} + // else + {{_ 'top-level-card'}} if archived p.warning {{_ 'card-archived'}} diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 4731e448..1c85580f 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -70,6 +70,14 @@ BlazeComponent.extendComponent({ } }, + presentParentTask() { + let result = this.currentBoard.presentParentTask; + if ((result === null) || (result === undefined)) { + result = 'no-parent'; + } + return result; + }, + onRendered() { if (!Utils.isMiniScreen()) this.scrollParentContainer(); const $checklistsDom = this.$('.card-checklist-items'); diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 2a8e95ab..9a9b897f 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -8,7 +8,21 @@ template(name="minicard") .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title +viewer - = title + if isTopLevel + = title + else + if $eq 'prefix-with-full-path' currentBoard.presentParentTask + [{{ parentString ' > ' }}] {{ title }} + else + if $eq 'prefix-with-parent' currentBoard.presentParentTask + [{{ parentCardName }}] {{ title }} + else + = title + if $eq 'subtext-with-full-path' currentBoard.presentParentTask + .small {{ parentString ' > ' }} + if $eq 'subtext-with-parent' currentBoard.presentParentTask + .small {{ parentCardName }} + .dates if receivedAt unless startAt diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index e410572f..ed2c45af 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -485,7 +485,14 @@ "queue": "Queue", "subtask-settings": "Subtasks Settings", "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", - "show-subtasks-field": "Cards can have subtasks:", + "show-subtasks-field": "Cards can have subtasks", "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:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with full parent", + "no-parent": "Don't show parent" + } diff --git a/models/boards.js b/models/boards.js index b5b0b0fc..2d80a56a 100644 --- a/models/boards.js +++ b/models/boards.js @@ -165,6 +165,18 @@ Boards.attachSchema(new SimpleSchema({ type: Boolean, defaultValue: true, }, + presentParentTask: { + type: String, + allowedValues: [ + 'prefix-with-full-path', + 'prefix-with-parent', + 'subtext-with-full-path', + 'subtext-with-parent', + 'no-parent', + ], + optional: true, + defaultValue: 'no-parent', + }, })); @@ -489,6 +501,10 @@ Boards.mutations({ setSubtasksDefaultListId(subtasksDefaultListId) { return { $set: { subtasksDefaultListId } }; }, + + setPresentParentTask(presentParentTask) { + return { $set: { presentParentTask } }; + }, }); if (Meteor.isServer) { diff --git a/models/cards.js b/models/cards.js index 8d7a93d0..323ec407 100644 --- a/models/cards.js +++ b/models/cards.js @@ -326,6 +326,59 @@ Cards.helpers({ return Cards.findOne(this.parentId); }, + parentCardName() { + if (this.parentId === '') { + return ''; + } + return Cards.findOne(this.parentId).title; + }, + + parentListId() { + const result = []; + let crtParentId = this.parentId; + while (crtParentId !== '') { + const crt = Cards.findOne(crtParentId); + if ((crt === null) || (crt === undefined)) { + // maybe it has been deleted + break; + } + if (crtParentId in result) { + // circular reference + break; + } + result.unshift(crtParentId); + crtParentId = crt.parentId; + } + return result; + }, + + parentList() { + const resultId = []; + const result = []; + let crtParentId = this.parentId; + while (crtParentId !== '') { + const crt = Cards.findOne(crtParentId); + if ((crt === null) || (crt === undefined)) { + // maybe it has been deleted + break; + } + if (crtParentId in resultId) { + // circular reference + break; + } + resultId.unshift(crtParentId); + result.unshift(crt); + crtParentId = crt.parentId; + } + return result; + }, + + parentString(sep) { + return this.parentList().map(function(elem){ + return elem.title; + }).join(sep); + }, + isTopLevel() { return this.parentId === ''; }, diff --git a/server/migrations.js b/server/migrations.js index c3da3221..5194b79f 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -294,7 +294,19 @@ Migrations.add('add-subtasks-allowed', () => { }, }, { $set: { - allowsSubtasks: -1, + allowsSubtasks: true, + }, + }, noValidateMulti); +}); + +Migrations.add('add-subtasks-allowed', () => { + Boards.update({ + presentParentTask: { + $exists: false, + }, + }, { + $set: { + presentParentTask: 'no-parent', }, }, noValidateMulti); }); -- cgit v1.2.3-1-g7c22 From 3a4a075dbadba8c1ce12fa86730a4507985729f7 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 13:22:51 +0300 Subject: Fix minicard parents display --- client/components/cards/minicard.jade | 27 +++++++++++++-------------- client/components/cards/minicard.styl | 7 +++++++ i18n/en.i18n.json | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 9a9b897f..57913669 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -7,21 +7,20 @@ template(name="minicard") each labels .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title + if $eq 'prefix-with-full-path' currentBoard.presentParentTask + .parent-prefix + | {{ parentString ' > ' }} + if $eq 'prefix-with-parent' currentBoard.presentParentTask + .parent-prefix + | {{ parentCardName }} +viewer - if isTopLevel - = title - else - if $eq 'prefix-with-full-path' currentBoard.presentParentTask - [{{ parentString ' > ' }}] {{ title }} - else - if $eq 'prefix-with-parent' currentBoard.presentParentTask - [{{ parentCardName }}] {{ title }} - else - = title - if $eq 'subtext-with-full-path' currentBoard.presentParentTask - .small {{ parentString ' > ' }} - if $eq 'subtext-with-parent' currentBoard.presentParentTask - .small {{ parentCardName }} + {{ title }} + if $eq 'subtext-with-full-path' currentBoard.presentParentTask + .parent-subtext + | {{ parentString ' > ' }} + if $eq 'subtext-with-parent' currentBoard.presentParentTask + .parent-subtext + | {{ parentCardName }} .dates if receivedAt diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 38f829d0..6c9414a7 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -162,6 +162,13 @@ margin-bottom: 20px overflow-y: auto +.parent-prefix + color: darken(white, 30%) + font-size: 0.9em +.parent-subtext + color: darken(white, 30%) + font-size: 0.9em + @media screen and (max-width: 800px) .minicard .is-selected & diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index ed2c45af..e89d6928 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -492,7 +492,7 @@ "prefix-with-full-path": "Prefix with full path", "prefix-with-parent": "Prefix with parent", "subtext-with-full-path": "Subtext with full path", - "subtext-with-parent": "Subtext with full parent", + "subtext-with-parent": "Subtext with parent", "no-parent": "Don't show parent" } -- cgit v1.2.3-1-g7c22 From bac490d2f3b5531125694ff0cd9fa1e55d255c80 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 14:10:58 +0300 Subject: Links for parents in card details. --- client/components/cards/cardDetails.jade | 2 +- client/components/cards/cardDetails.js | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index a5b8a2b3..0110d12e 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -16,7 +16,7 @@ template(name="cardDetails") .card-details-path each parentList |   >   - a.js-parent-card {{title}} + a.js-parent-card(href=linkForCard) {{title}} // else {{_ 'top-level-card'}} diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 1c85580f..d4957964 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -20,10 +20,11 @@ BlazeComponent.extendComponent({ }, onCreated() { + this.currentBoard = Boards.findOne(Session.get('currentBoard')); this.isLoaded = new ReactiveVar(false); const boardBody = this.parentComponent().parentComponent(); //in Miniview parent is Board, not BoardBody. - if (boardBody !== null){ + if (boardBody !== null) { boardBody.showOverlay.set(true); boardBody.mouseHasEnterCardDetails = false; } @@ -78,6 +79,22 @@ BlazeComponent.extendComponent({ return result; }, + linkForCard() { + const card = this.currentData(); + let result = '#'; + if (card) { + const board = Boards.findOne(card.boardId); + if (board) { + result = FlowRouter.url('card', { + boardId: card.boardId, + slug: board.slug, + cardId: card._id, + }); + } + } + return result; + }, + onRendered() { if (!Utils.isMiniScreen()) this.scrollParentContainer(); const $checklistsDom = this.$('.card-checklist-items'); -- cgit v1.2.3-1-g7c22 From 439d7c3dbc38e6b8165b3d65f78d0f90e7e5d7db Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 14:49:21 +0300 Subject: Fix conflict in migrations (Error: title is required by removing find() from all of migrations.) --- server/migrations.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/server/migrations.js b/server/migrations.js index 5194b79f..10097d41 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -55,7 +55,7 @@ Migrations.add('lowercase-board-permission', () => { // Security migration: see https://github.com/wekan/wekan/issues/99 Migrations.add('change-attachments-type-for-non-images', () => { const newTypeForNonImage = 'application/octet-stream'; - Attachments.find().forEach((file) => { + Attachments.forEach((file) => { if (!file.isImage()) { Attachments.update(file._id, { $set: { @@ -68,7 +68,7 @@ Migrations.add('change-attachments-type-for-non-images', () => { }); Migrations.add('card-covers', () => { - Cards.find().forEach((card) => { + Cards.forEach((card) => { const cover = Attachments.findOne({ cardId: card._id, cover: true }); if (cover) { Cards.update(card._id, {$set: {coverId: cover._id}}, noValidate); @@ -86,7 +86,7 @@ Migrations.add('use-css-class-for-boards-colors', () => { '#2C3E50': 'midnight', '#E67E22': 'pumpkin', }; - Boards.find().forEach((board) => { + Boards.forEach((board) => { const oldBoardColor = board.background.color; const newBoardColor = associationTable[oldBoardColor]; Boards.update(board._id, { @@ -97,7 +97,7 @@ Migrations.add('use-css-class-for-boards-colors', () => { }); Migrations.add('denormalize-star-number-per-board', () => { - Boards.find().forEach((board) => { + Boards.forEach((board) => { const nStars = Users.find({'profile.starredBoards': board._id}).count(); Boards.update(board._id, {$set: {stars: nStars}}, noValidate); }); @@ -132,7 +132,7 @@ Migrations.add('add-member-isactive-field', () => { }); Migrations.add('add-sort-checklists', () => { - Checklists.find().forEach((checklist, index) => { + Checklists.forEach((checklist, index) => { if (!checklist.hasOwnProperty('sort')) { Checklists.direct.update( checklist._id, @@ -153,9 +153,8 @@ Migrations.add('add-sort-checklists', () => { }); Migrations.add('add-swimlanes', () => { - Boards.find().forEach((board) => { + Boards.forEach((board) => { const swimlaneId = board.getDefaultSwimline()._id; - Cards.find({ boardId: board._id }).forEach((card) => { if (!card.hasOwnProperty('swimlaneId')) { Cards.direct.update( @@ -169,7 +168,7 @@ Migrations.add('add-swimlanes', () => { }); Migrations.add('add-views', () => { - Boards.find().forEach((board) => { + Boards.forEach((board) => { if (!board.hasOwnProperty('view')) { Boards.direct.update( { _id: board._id }, @@ -181,7 +180,7 @@ Migrations.add('add-views', () => { }); Migrations.add('add-checklist-items', () => { - Checklists.find().forEach((checklist) => { + Checklists.forEach((checklist) => { // Create new items _.sortBy(checklist.items, 'sort').forEach((item, index) => { ChecklistItems.direct.insert({ @@ -202,7 +201,7 @@ Migrations.add('add-checklist-items', () => { }); Migrations.add('add-profile-view', () => { - Users.find().forEach((user) => { + Users.forEach((user) => { if (!user.hasOwnProperty('profile.boardView')) { // Set default view Users.direct.update( -- cgit v1.2.3-1-g7c22 From b7d508e8c4cf858559e144053d119ceaebfa9697 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 17:39:31 +0300 Subject: Added ability to change card's parent. --- client/components/cards/cardDetails.jade | 27 ++++++ client/components/cards/cardDetails.js | 137 +++++++++++++++++++++++++------ i18n/en.i18n.json | 3 + models/boards.js | 4 + models/cards.js | 15 +++- 5 files changed, 156 insertions(+), 30 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 0110d12e..aaad7c7c 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -283,10 +283,37 @@ template(name="cardMorePopup") button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}} span.clearfix br + h2 {{_ 'change-card-parent'}} + label {{_ 'source-board'}}: + select.js-field-parent-board + each boards + if isParentBoard + option(value="{{_id}}" selected) {{title}} + else + option(value="{{_id}}") {{title}} + if isTopLevel + option(value="none" selected) {{_ 'custom-field-dropdown-none'}} + else + option(value="none") {{_ 'custom-field-dropdown-none'}} + + label {{_ 'parent-card'}}: + select.js-field-parent-card + if isTopLevel + option(value="none" selected) {{_ 'custom-field-dropdown-none'}} + else + each cards + if isParentCard + option(value="{{_id}}" selected) {{title}} + else + option(value="{{_id}}") {{title}} + option(value="none") {{_ 'custom-field-dropdown-none'}} + br | {{_ 'added'}} span.date(title=card.createdAt) {{ moment createdAt 'LLL' }} a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}} + + template(name="cardDeletePopup") p {{_ "card-delete-pop"}} unless archived diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index d4957964..5fee1680 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -390,7 +390,6 @@ Template.moveCardPopup.events({ Popup.close(); }, }); - BlazeComponent.extendComponent({ onCreated() { subManager.subscribe('board', Session.get('currentBoard')); @@ -427,6 +426,7 @@ BlazeComponent.extendComponent({ }, }).register('boardsAndLists'); + function cloneCheckList(_id, checklist) { 'use strict'; const checklistId = checklist._id; @@ -558,36 +558,119 @@ Template.copyChecklistToManyCardsPopup.events({ }, }); +BlazeComponent.extendComponent({ + onCreated() { + this.currentCard = this.currentData(); + this.parentCard = this.currentCard.parentCard(); + if (this.parentCard) { + this.parentBoard = this.parentCard.board(); + } else { + this.parentBoard = null; + } + }, + + boards() { + const boards = Boards.find({ + archived: false, + 'members.userId': Meteor.userId(), + }, { + sort: ['title'], + }); + return boards; + }, -Template.cardMorePopup.events({ - 'click .js-copy-card-link-to-clipboard' () { - // Clipboard code from: - // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser - const StringToCopyElement = document.getElementById('cardURL'); - StringToCopyElement.select(); - if (document.execCommand('copy')) { - StringToCopyElement.blur(); + cards() { + if (this.parentBoard) { + return this.parentBoard.cards(); } else { - document.getElementById('cardURL').selectionStart = 0; - document.getElementById('cardURL').selectionEnd = 999; - document.execCommand('copy'); - if (window.getSelection) { - if (window.getSelection().empty) { // Chrome - window.getSelection().empty(); - } else if (window.getSelection().removeAllRanges) { // Firefox - window.getSelection().removeAllRanges(); - } - } else if (document.selection) { // IE? - document.selection.empty(); - } + return []; } }, - 'click .js-delete': Popup.afterConfirm('cardDelete', function () { - Popup.close(); - Cards.remove(this._id); - Utils.goBoardId(this.boardId); - }), -}); + + isParentBoard() { + const board = this.currentData(); + if (this.parentBoard) { + return board._id === this.parentBoard; + } + return false; + }, + + isParentCard() { + const card = this.currentData(); + if (this.parentCard) { + return card._id === this.parentCard; + } + return false; + }, + + setParentCardId(cardId) { + if (cardId === 'null') { + cardId = null; + this.parentCard = null; + } else { + this.parentCard = Cards.findOne(cardId); + } + this.currentCard.setParentId(cardId); + }, + + events() { + return [{ + 'click .js-copy-card-link-to-clipboard' () { + // Clipboard code from: + // https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser + const StringToCopyElement = document.getElementById('cardURL'); + StringToCopyElement.select(); + if (document.execCommand('copy')) { + StringToCopyElement.blur(); + } else { + document.getElementById('cardURL').selectionStart = 0; + document.getElementById('cardURL').selectionEnd = 999; + document.execCommand('copy'); + if (window.getSelection) { + if (window.getSelection().empty) { // Chrome + window.getSelection().empty(); + } else if (window.getSelection().removeAllRanges) { // Firefox + window.getSelection().removeAllRanges(); + } + } else if (document.selection) { // IE? + document.selection.empty(); + } + } + }, + 'click .js-delete': Popup.afterConfirm('cardDelete', function () { + Popup.close(); + Cards.remove(this._id); + Utils.goBoardId(this.boardId); + }), + 'change .js-field-parent-board'(evt) { + const selection = $(evt.currentTarget).val(); + const list = $('.js-field-parent-card'); + list.empty(); + if (selection === 'none') { + this.parentBoard = null; + list.prop('disabled', true); + } else { + this.parentBoard = Boards.findOne(selection); + this.parentBoard.cards().forEach(function(card) { + list.append( + $('').val(card._id).html(card.title) + ); + }); + list.prop('disabled', false); + } + list.append( + `` + ); + this.setParentCardId('null'); + }, + 'change .js-field-parent-card'(evt) { + const selection = $(evt.currentTarget).val(); + this.setParentCardId(selection); + }, + }]; + }, +}).register('cardMorePopup'); + // Close the card details pane by pressing escape EscapeActions.register('detailsPane', diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index e89d6928..42dbd2d5 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -493,6 +493,9 @@ "prefix-with-parent": "Prefix with parent", "subtext-with-full-path": "Subtext with full path", "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", "no-parent": "Don't show parent" } diff --git a/models/boards.js b/models/boards.js index 2d80a56a..c83050c0 100644 --- a/models/boards.js +++ b/models/boards.js @@ -220,6 +220,10 @@ Boards.helpers({ return Swimlanes.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } }); }, + cards() { + return Cards.find({ boardId: this._id, archived: false }, { sort: { sort: 1 } }); + }, + hasOvertimeCards(){ const card = Cards.findOne({isOvertime: true, boardId: this._id, archived: false} ); return card !== undefined; diff --git a/models/cards.js b/models/cards.js index 323ec407..b6a7b4c6 100644 --- a/models/cards.js +++ b/models/cards.js @@ -327,10 +327,14 @@ Cards.helpers({ }, parentCardName() { - if (this.parentId === '') { - return ''; + let result = ''; + if (this.parentId !== '') { + const card = Cards.findOne(this.parentId); + if (card) { + result = card.title; + } } - return Cards.findOne(this.parentId).title; + return result; }, parentListId() { @@ -541,6 +545,11 @@ Cards.mutations({ unsetSpentTime() { return {$unset: {spentTime: '', isOvertime: false}}; }, + + setParentId(parentId) { + return {$set: {parentId}}; + }, + }); -- cgit v1.2.3-1-g7c22 From 3c4549fe64c8b57f1f9e2eb700889aa1488ad056 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Wed, 27 Jun 2018 22:23:28 +0300 Subject: Can show card on top of calendar --- client/components/boards/boardBody.jade | 8 ++++- client/components/boards/boardBody.js | 63 ++++----------------------------- 2 files changed, 13 insertions(+), 58 deletions(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index b480bc0f..0a454e92 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -26,4 +26,10 @@ template(name="boardBody") if isViewLists +listsGroup if isViewCalendar - +fullcalendar(calendarOptions) + +calendarView + +template(name="calendarView") + .swimlane.list-group.js-lists + if currentCard + +cardDetails(currentCard) + +fullcalendar diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 935c550f..911b0120 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -113,63 +113,6 @@ BlazeComponent.extendComponent({ .childComponents('addListForm')[0].open(); } }, - - calendarOptions() { - return { - id: 'calendar-view', - defaultView: 'basicWeek', - header: { - left: 'title', - center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear', - right: 'today prev,next', - }, - views: { - basic: { - // options apply to basicWeek and basicDay views - }, - agenda: { - // options apply to agendaWeek and agendaDay views - }, - week: { - // options apply to basicWeek and agendaWeek views - }, - day: { - // options apply to basicDay and agendaDay views - }, - }, - themeSystem: 'jquery-ui', - height: 'parent', - /* TODO: lists as resources: https://fullcalendar.io/docs/vertical-resource-view */ - navLinks: true, - nowIndicator: true, - businessHours: { - // days of week. an array of zero-based day of week integers (0=Sunday) - dow: [ 1, 2, 3, 4, 5 ], // Monday - Thursday - start: '8:00', - end: '18:00', - }, - locale: TAPi18n.getLanguage(), - events(start, end, timezone, callback) { - const currentBoard = Boards.findOne(Session.get('currentBoard')); - const events = []; - currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){ - events.push({ - id: card.id, - title: card.title, - start: card.startAt, - end: card.endAt, - url: FlowRouter.url('card', { - boardId: currentBoard._id, - slug: currentBoard.slug, - cardId: card._id, - }), - }); - }); - callback(events); - }, - }; - }, - events() { return [{ // XXX The board-overlay div should probably be moved to the parent @@ -202,3 +145,9 @@ BlazeComponent.extendComponent({ }, }).register('boardBody'); + +BlazeComponent.extendComponent({ + onRendered() { + + }, +}).register('calendarView'); -- cgit v1.2.3-1-g7c22 From 374e9865792dd8219d1d7d10fcc23f98ed7c5817 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Wed, 27 Jun 2018 22:37:32 +0300 Subject: Can show card on event click --- client/components/boards/boardBody.jade | 4 ++-- client/components/boards/boardBody.js | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 0a454e92..9e4b9c61 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -29,7 +29,7 @@ template(name="boardBody") +calendarView template(name="calendarView") - .swimlane.list-group.js-lists + .calendar-view.swimlane if currentCard +cardDetails(currentCard) - +fullcalendar + +fullcalendar(calendarOptions) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 911b0120..1308c280 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -150,4 +150,28 @@ BlazeComponent.extendComponent({ onRendered() { }, + calendarOptions() { + return { + id: 'calendar-view', + defaultView: 'basicWeek', + events(start, end, timezone, callback) { + const currentBoard = Boards.findOne(Session.get('currentBoard')); + const events = []; + currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){ + events.push({ + id: card.id, + title: card.title, + start: card.startAt, + end: card.endAt, + url: FlowRouter.url('card', { + boardId: currentBoard._id, + slug: currentBoard.slug, + cardId: card._id, + }), + }); + }); + callback(events); + }, + }; + }, }).register('calendarView'); -- cgit v1.2.3-1-g7c22 From 9cb8aab3ba8554ae85141ac5e7e199867949bef2 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Wed, 27 Jun 2018 23:00:14 +0300 Subject: Reactive change when a date is modified. --- client/components/boards/boardBody.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 1308c280..dc6b9bef 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -148,12 +148,31 @@ BlazeComponent.extendComponent({ BlazeComponent.extendComponent({ onRendered() { - + this.autorun(function(){ + $('#calendar-view').fullCalendar('refetchEvents'); + }); }, calendarOptions() { return { id: 'calendar-view', - defaultView: 'basicWeek', + defaultView: 'agendaDay', + header: { + left: 'title today prev,next', + center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear', + right: '', + }, + // height: 'parent', nope, doesn't work as the parent might be small + height: 'auto', + /* TODO: lists as resources: https://fullcalendar.io/docs/vertical-resource-view */ + navLinks: true, + nowIndicator: true, + businessHours: { + // days of week. an array of zero-based day of week integers (0=Sunday) + dow: [ 1, 2, 3, 4, 5 ], // Monday - Friday + start: '8:00', + end: '18:00', + }, + locale: TAPi18n.getLanguage(), events(start, end, timezone, callback) { const currentBoard = Boards.findOne(Session.get('currentBoard')); const events = []; -- cgit v1.2.3-1-g7c22 From db5ff4e1e2640b7312533cb276b545c4b9920110 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Thu, 28 Jun 2018 00:13:35 +0300 Subject: Changing events in calendar updates the card --- client/components/boards/boardBody.js | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index dc6b9bef..68ac8b27 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -156,6 +156,8 @@ BlazeComponent.extendComponent({ return { id: 'calendar-view', defaultView: 'agendaDay', + editable: true, + timezone: 'local', header: { left: 'title today prev,next', center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear', @@ -178,10 +180,11 @@ BlazeComponent.extendComponent({ const events = []; currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){ events.push({ - id: card.id, + id: card._id, title: card.title, start: card.startAt, end: card.endAt, + allDay: Math.abs(card.endAt.getTime() - card.startAt.getTime()) / 1000 === 24*3600, url: FlowRouter.url('card', { boardId: currentBoard._id, slug: currentBoard.slug, @@ -191,6 +194,33 @@ BlazeComponent.extendComponent({ }); callback(events); }, + eventResize(event, delta, revertFunc) { + let isOk = false; + const card = Cards.findOne(event.id); + + if (card) { + card.setEnd(event.end.toDate()); + isOk = true; + } + if (!isOk) { + revertFunc(); + } + }, + eventDrop(event, delta, revertFunc) { + let isOk = false; + const card = Cards.findOne(event.id); + if (card) { + // TODO: add a flag for allDay events + if (!event.allDay) { + card.setStart(event.start.toDate()); + card.setEnd(event.end.toDate()); + isOk = true; + } + } + if (!isOk) { + revertFunc(); + } + }, }; }, }).register('calendarView'); -- cgit v1.2.3-1-g7c22 From bbdb6a90b29040aeb6afe8541e3549b043b2610d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:40:08 +0300 Subject: Download node from sandstorm in Dockerfile. --- Dockerfile | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b8b6a09..e6bc5382 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ ENV SRC_PATH ${SRC_PATH:-./} COPY ${SRC_PATH} /home/wekan/app RUN \ - # Add non-root user wekan + echo "=== Add non-root user wekan" && \ useradd --user-group --system --home-dir /home/wekan wekan && \ \ - # OS dependencies + echo "=== OS dependencies" && \ apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Download nodejs @@ -45,13 +45,65 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; + echo "=== Getting newest Node from Sandstorm fork of Node" && \ + echo "=== Source: https://github.com/sandstorm-io/node ===" && \ + \ + # From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf + SANDSTORM_BRANCH_NUMBER=0 && \ + \ + # From https://github.com/sandstorm-io/sandstorm/blob/master/release.sh + SANDSTORM_CHANNEL=dev && \ + SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) && \ + \ + echo "=== Latest Sandstorm Release: ${SANDSTORM_LAST_BUILD}===" && \ + if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); && \ + then && \ + echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 && \ + echo " I refuse to replace it with an older branch." >&2 && \ + exit 1 && \ + fi && \ + BASE_BUILD=$(( BRANCH_NUMBER * 1000 )) && \ + BUILD=$(( BASE_BUILD > LAST_BUILD ? BASE_BUILD : LAST_BUILD + 1 )) && \ + BUILD_MINOR="$(( $BUILD % 1000 ))" && \ + DISPLAY_VERSION="${BRANCH_NUMBER}.${BUILD_MINOR}" && \ + TAG_NAME="v${DISPLAY_VERSION}" && \ + SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD && \ + TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz && \ + NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node && \ + echo "=== Downloading Sandstorm GPG keys to verify Sandstorm release" && \ + # Do verification in custom GPG workspace + # https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install + export GNUPGHOME=$(mktemp -d) && \ + curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | gpg --import && \ + wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig && \ + gpg --decrypt release-certificate.kentonv.sig && \ + echo "=== Downloading Sandstorm release from https://dl.sandstorm.io/${TARBALL} ===" && \ + wget https://dl.sandstorm.io/$TARBALL && \ + echo "=== Downloading signature for Sandstorm release from https://dl.sandstorm.io/${TARBALL}.sig ===" && \ + wget https://dl.sandstorm.io/$TARBALL.sig && \ + echo "=== Verifying signature of Sandstorm release" && \ + gpg --verify $TARBALL.sig $TARBALL && \ + \ + if [ $? -eq 0 ] && \ + then && \ + echo "=== All is well. Good signature in Sandstorm." && \ + else && \ + echo "=== PROBLEM WITH SANDSTORM SIGNATURE." && \ + exit 1 && \ + fi && \ + echo "=== Extracting Node from Sandstorm release tarball" && \ + # --strip 2 removes path of 2 subdirectories + tar -xf $TARBALL $NODE_EXE --strip=2 && \ + echo "=== Deleting Sandstorm release tarball and signature" && \ + rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ + # == OLD == # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt - wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ - \ + ##wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + ##echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + ##\ # Verify nodejs authenticity - grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ + ##grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ #export GNUPGHOME="$(mktemp -d)" && \ #\ # Try other key servers if ha.pool.sks-keyservers.net is unreachable @@ -75,24 +127,25 @@ RUN \ # Ignore socket files then delete files then delete directories #find "$GNUPGHOME" -type f | xargs rm -f && \ #find "$GNUPGHOME" -type d | xargs rm -fR && \ - rm -f SHASUMS256.txt.asc && \ + ##rm -f SHASUMS256.txt.asc && \ \ # Install Node - tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ + #tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + #rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + #mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ + mv node /opt/nodejs && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 #paxctl -mC `which node` && \ \ - # Install Node dependencies + echo "=== Install Node dependencies" && \ npm install -g npm@${NPM_VERSION} && \ npm install -g node-gyp && \ npm install -g fibers@${FIBERS_VERSION} && \ \ - # Change user to wekan and install meteor + echo "=== Change user to wekan and install meteor" && \ cd /home/wekan/ && \ chown wekan:wekan --recursive /home/wekan && \ curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \ @@ -107,7 +160,7 @@ RUN \ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ fi; \ \ - # Get additional packages + echo "=== Get additional packages" && \ mkdir -p /home/wekan/app/packages && \ chown wekan:wekan --recursive /home/wekan && \ cd /home/wekan/app/packages && \ @@ -117,7 +170,7 @@ RUN \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ \ - # Build app + echo "=== Build app" && \ cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ @@ -135,7 +188,7 @@ RUN \ #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ - # Cleanup + echo "=== Cleanup" && \ apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ rm -R /var/lib/apt/lists/* && \ -- cgit v1.2.3-1-g7c22 From aea5ed78486b4709163d803f332ed2eed7fcfd3b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:48:49 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6bc5382..e199c7c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,10 @@ ENV SRC_PATH ${SRC_PATH:-./} COPY ${SRC_PATH} /home/wekan/app RUN \ - echo "=== Add non-root user wekan" && \ + # Add non-root user wekan useradd --user-group --system --home-dir /home/wekan wekan && \ \ - echo "=== OS dependencies" && \ + # OS dependencies apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ # Download nodejs @@ -45,8 +45,8 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - echo "=== Getting newest Node from Sandstorm fork of Node" && \ - echo "=== Source: https://github.com/sandstorm-io/node ===" && \ + # Getting newest Node from Sandstorm fork of Node + # Source: https://github.com/sandstorm-io/node \ # From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf SANDSTORM_BRANCH_NUMBER=0 && \ @@ -55,7 +55,7 @@ RUN \ SANDSTORM_CHANNEL=dev && \ SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) && \ \ - echo "=== Latest Sandstorm Release: ${SANDSTORM_LAST_BUILD}===" && \ + # Latest Sandstorm Release if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); && \ then && \ echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 && \ @@ -70,18 +70,18 @@ RUN \ SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD && \ TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz && \ NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node && \ - echo "=== Downloading Sandstorm GPG keys to verify Sandstorm release" && \ + # Downloading Sandstorm GPG keys to verify Sandstorm release. # Do verification in custom GPG workspace # https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install export GNUPGHOME=$(mktemp -d) && \ curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | gpg --import && \ wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig && \ gpg --decrypt release-certificate.kentonv.sig && \ - echo "=== Downloading Sandstorm release from https://dl.sandstorm.io/${TARBALL} ===" && \ + # Downloading Sandstorm release from https://dl.sandstorm.io/${TARBALL} wget https://dl.sandstorm.io/$TARBALL && \ - echo "=== Downloading signature for Sandstorm release from https://dl.sandstorm.io/${TARBALL}.sig ===" && \ + # Downloading signature for Sandstorm release from https://dl.sandstorm.io/${TARBALL}.sig wget https://dl.sandstorm.io/$TARBALL.sig && \ - echo "=== Verifying signature of Sandstorm release" && \ + # Verifying signature of Sandstorm release gpg --verify $TARBALL.sig $TARBALL && \ \ if [ $? -eq 0 ] && \ @@ -94,7 +94,7 @@ RUN \ echo "=== Extracting Node from Sandstorm release tarball" && \ # --strip 2 removes path of 2 subdirectories tar -xf $TARBALL $NODE_EXE --strip=2 && \ - echo "=== Deleting Sandstorm release tarball and signature" && \ + # Deleting Sandstorm release tarball and signature rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ # == OLD == # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm @@ -140,12 +140,12 @@ RUN \ #DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 #paxctl -mC `which node` && \ \ - echo "=== Install Node dependencies" && \ + # Install Node dependencies npm install -g npm@${NPM_VERSION} && \ npm install -g node-gyp && \ npm install -g fibers@${FIBERS_VERSION} && \ \ - echo "=== Change user to wekan and install meteor" && \ + # Change user to wekan and install meteor cd /home/wekan/ && \ chown wekan:wekan --recursive /home/wekan && \ curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \ @@ -160,7 +160,7 @@ RUN \ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor; \ fi; \ \ - echo "=== Get additional packages" && \ + # Get additional packages mkdir -p /home/wekan/app/packages && \ chown wekan:wekan --recursive /home/wekan && \ cd /home/wekan/app/packages && \ @@ -170,7 +170,7 @@ RUN \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ \ - echo "=== Build app" && \ + # Build app cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ @@ -188,7 +188,7 @@ RUN \ #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ - echo "=== Cleanup" && \ + # Cleanup apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ rm -R /var/lib/apt/lists/* && \ -- cgit v1.2.3-1-g7c22 From e03ee1bd2f4217b0ac2be05ed556aeba0480ff83 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 18:51:42 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e199c7c8..34edeac3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,12 +84,12 @@ RUN \ # Verifying signature of Sandstorm release gpg --verify $TARBALL.sig $TARBALL && \ \ - if [ $? -eq 0 ] && \ - then && \ - echo "=== All is well. Good signature in Sandstorm." && \ - else && \ - echo "=== PROBLEM WITH SANDSTORM SIGNATURE." && \ - exit 1 && \ + if [ $? -eq 0 ] \ + then \ + echo "=== All is well. Good signature in Sandstorm." \ + else \ + echo "=== PROBLEM WITH SANDSTORM SIGNATURE." \ + exit 1 \ fi && \ echo "=== Extracting Node from Sandstorm release tarball" && \ # --strip 2 removes path of 2 subdirectories -- cgit v1.2.3-1-g7c22 From 44e20023cce82d7f10fba2c97ece53287eb6f3f1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:05:39 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 52 +++--------------------------------- download-sandstorm-node.sh | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 49 deletions(-) create mode 100755 download-sandstorm-node.sh diff --git a/Dockerfile b/Dockerfile index 34edeac3..dbeeef5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,55 +47,9 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # Source: https://github.com/sandstorm-io/node - \ - # From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf - SANDSTORM_BRANCH_NUMBER=0 && \ - \ - # From https://github.com/sandstorm-io/sandstorm/blob/master/release.sh - SANDSTORM_CHANNEL=dev && \ - SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) && \ - \ - # Latest Sandstorm Release - if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); && \ - then && \ - echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 && \ - echo " I refuse to replace it with an older branch." >&2 && \ - exit 1 && \ - fi && \ - BASE_BUILD=$(( BRANCH_NUMBER * 1000 )) && \ - BUILD=$(( BASE_BUILD > LAST_BUILD ? BASE_BUILD : LAST_BUILD + 1 )) && \ - BUILD_MINOR="$(( $BUILD % 1000 ))" && \ - DISPLAY_VERSION="${BRANCH_NUMBER}.${BUILD_MINOR}" && \ - TAG_NAME="v${DISPLAY_VERSION}" && \ - SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD && \ - TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz && \ - NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node && \ - # Downloading Sandstorm GPG keys to verify Sandstorm release. - # Do verification in custom GPG workspace - # https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install - export GNUPGHOME=$(mktemp -d) && \ - curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | gpg --import && \ - wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig && \ - gpg --decrypt release-certificate.kentonv.sig && \ - # Downloading Sandstorm release from https://dl.sandstorm.io/${TARBALL} - wget https://dl.sandstorm.io/$TARBALL && \ - # Downloading signature for Sandstorm release from https://dl.sandstorm.io/${TARBALL}.sig - wget https://dl.sandstorm.io/$TARBALL.sig && \ - # Verifying signature of Sandstorm release - gpg --verify $TARBALL.sig $TARBALL && \ - \ - if [ $? -eq 0 ] \ - then \ - echo "=== All is well. Good signature in Sandstorm." \ - else \ - echo "=== PROBLEM WITH SANDSTORM SIGNATURE." \ - exit 1 \ - fi && \ - echo "=== Extracting Node from Sandstorm release tarball" && \ - # --strip 2 removes path of 2 subdirectories - tar -xf $TARBALL $NODE_EXE --strip=2 && \ - # Deleting Sandstorm release tarball and signature - rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* && \ + wget https://github.com/wekan/wekan/blob/devel/download-sandstorm-node.sh && \ + bash download-sandstorm-node.sh && \ + rm download-sandstorm-node.sh && \ # == OLD == # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh new file mode 100755 index 00000000..2e611f05 --- /dev/null +++ b/download-sandstorm-node.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +echo "=== GETTING NEWEST NODE FROM SANDSTORM FORK OF NODE ===" +echo "=== SOURCE: https://github.com/sandstorm-io/node ===" + +# From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf +SANDSTORM_BRANCH_NUMBER=0 + +# From https://github.com/sandstorm-io/sandstorm/blob/master/release.sh +SANDSTORM_CHANNEL=dev +SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) + +echo "=== LATEST SANDSTORM RELEASE: ${SANDSTORM_LAST_BUILD}===" + +if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); then + echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 + echo " I refuse to replace it with an older branch." >&2 + exit 1 +fi + +BASE_BUILD=$(( BRANCH_NUMBER * 1000 )) +BUILD=$(( BASE_BUILD > LAST_BUILD ? BASE_BUILD : LAST_BUILD + 1 )) +BUILD_MINOR="$(( $BUILD % 1000 ))" +DISPLAY_VERSION="${BRANCH_NUMBER}.${BUILD_MINOR}" +TAG_NAME="v${DISPLAY_VERSION}" +SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD + +TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz +NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node + +echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ===" + +# Do verification in custom GPG workspace +# https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install +export GNUPGHOME=$(mktemp -d) + +curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | \ + gpg --import + +wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig + +gpg --decrypt release-certificate.kentonv.sig + +echo "=== DOWNLOADING SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL} ===" +wget https://dl.sandstorm.io/$TARBALL + +echo "=== DOWNLOADING SIGNATURE FOR SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL}.sig ===" +wget https://dl.sandstorm.io/$TARBALL.sig + +echo "=== VERIFYING SIGNATURE OF SANDSTORM RELEASE ===" +gpg --verify $TARBALL.sig $TARBALL + +if [ $? -eq 0 ] +then + echo "=== ALL IS WELL. GOOD SIGNATURE IN SANDSTORM. ===" +else + echo "=== PROBLEM WITH SANDSTORM SIGNATURE. ===" + exit 1 +fi + +echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ===" +# --strip 2 removes path of 2 subdirectories +tar -xf $TARBALL $NODE_EXE --strip=2 + +echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ===" +rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* -- cgit v1.2.3-1-g7c22 From bf06c715fe41b1689f451c1ae1112a06b377768f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:09:57 +0300 Subject: Fix URL. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbeeef5b..1f44fced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # Source: https://github.com/sandstorm-io/node - wget https://github.com/wekan/wekan/blob/devel/download-sandstorm-node.sh && \ + wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \ bash download-sandstorm-node.sh && \ rm download-sandstorm-node.sh && \ # == OLD == -- cgit v1.2.3-1-g7c22 From 1f7db171d94af97187ac22ae07f3cad2b11d7ae1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:38:49 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 4 +++- download-sandstorm-node.sh | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f44fced..b52b62ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,9 @@ RUN \ #tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ - mv node /opt/nodejs && \ + mkdir -p /opt/nodejs/bin && + mv node /opt/nodejs/bin/ && \ + mv npm /opt/nodejs/bin/ && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh index 2e611f05..ec2b9394 100755 --- a/download-sandstorm-node.sh +++ b/download-sandstorm-node.sh @@ -27,6 +27,7 @@ SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node +NPM_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/npm echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ===" @@ -60,7 +61,7 @@ fi echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ===" # --strip 2 removes path of 2 subdirectories -tar -xf $TARBALL $NODE_EXE --strip=2 +tar -xf $TARBALL $NODE_EXE $NPM_EXE --strip=2 echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ===" rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* -- cgit v1.2.3-1-g7c22 From e139e140f4b4a6b3415d2592466d656504f1ade7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:42:04 +0300 Subject: Fix typo. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b52b62ff..d21854d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,7 +87,7 @@ RUN \ #tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ #mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ - mkdir -p /opt/nodejs/bin && + mkdir -p /opt/nodejs/bin && \ mv node /opt/nodejs/bin/ && \ mv npm /opt/nodejs/bin/ && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ -- cgit v1.2.3-1-g7c22 From abf7890941e7139e77aadb9c75ba4c314a9a6a1a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 19:59:00 +0300 Subject: Try to fix Dockerfile. --- Dockerfile | 1 + download-sandstorm-node.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d21854d5..906638dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,7 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # Source: https://github.com/sandstorm-io/node + curl -sL https://deb.nodesource.com/setup_8.x | bash - wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \ bash download-sandstorm-node.sh && \ rm download-sandstorm-node.sh && \ diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh index ec2b9394..2e611f05 100755 --- a/download-sandstorm-node.sh +++ b/download-sandstorm-node.sh @@ -27,7 +27,6 @@ SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node -NPM_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/npm echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ===" @@ -61,7 +60,7 @@ fi echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ===" # --strip 2 removes path of 2 subdirectories -tar -xf $TARBALL $NODE_EXE $NPM_EXE --strip=2 +tar -xf $TARBALL $NODE_EXE --strip=2 echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ===" rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* -- cgit v1.2.3-1-g7c22 From 2ac7660f29bae026350595596207b918286a2c23 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 20:01:13 +0300 Subject: Fix typo. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 906638dc..ac1fa9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN \ # Fiber.poolSize = 1e9; # Getting newest Node from Sandstorm fork of Node # Source: https://github.com/sandstorm-io/node - curl -sL https://deb.nodesource.com/setup_8.x | bash - + curl -sL https://deb.nodesource.com/setup_8.x | bash - && \ wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \ bash download-sandstorm-node.sh && \ rm download-sandstorm-node.sh && \ -- cgit v1.2.3-1-g7c22 From 05869792ad09edbe9dacc67460b5e98e9642bb2a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 2 Jul 2018 20:06:22 +0300 Subject: Revert Dockerfile changes. --- Dockerfile | 26 ++++++------------ download-sandstorm-node.sh | 66 ---------------------------------------------- 2 files changed, 8 insertions(+), 84 deletions(-) delete mode 100755 download-sandstorm-node.sh diff --git a/Dockerfile b/Dockerfile index ac1fa9fc..8b8b6a09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,20 +45,13 @@ RUN \ # Also see beginning of wekan/server/authentication.js # import Fiber from "fibers"; # Fiber.poolSize = 1e9; - # Getting newest Node from Sandstorm fork of Node - # Source: https://github.com/sandstorm-io/node - curl -sL https://deb.nodesource.com/setup_8.x | bash - && \ - wget https://raw.githubusercontent.com/wekan/wekan/devel/download-sandstorm-node.sh && \ - bash download-sandstorm-node.sh && \ - rm download-sandstorm-node.sh && \ - # == OLD == # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt - ##wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - ##echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ - ##\ + wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + \ # Verify nodejs authenticity - ##grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ + grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ #export GNUPGHOME="$(mktemp -d)" && \ #\ # Try other key servers if ha.pool.sks-keyservers.net is unreachable @@ -82,15 +75,12 @@ RUN \ # Ignore socket files then delete files then delete directories #find "$GNUPGHOME" -type f | xargs rm -f && \ #find "$GNUPGHOME" -type d | xargs rm -fR && \ - ##rm -f SHASUMS256.txt.asc && \ + rm -f SHASUMS256.txt.asc && \ \ # Install Node - #tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - #rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - #mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ - mkdir -p /opt/nodejs/bin && \ - mv node /opt/nodejs/bin/ && \ - mv npm /opt/nodejs/bin/ && \ + tar xvzf node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + rm node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ + mv node-${NODE_VERSION}-${ARCHITECTURE} /opt/nodejs && \ ln -s /opt/nodejs/bin/node /usr/bin/node && \ ln -s /opt/nodejs/bin/npm /usr/bin/npm && \ \ diff --git a/download-sandstorm-node.sh b/download-sandstorm-node.sh deleted file mode 100755 index 2e611f05..00000000 --- a/download-sandstorm-node.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -echo "=== GETTING NEWEST NODE FROM SANDSTORM FORK OF NODE ===" -echo "=== SOURCE: https://github.com/sandstorm-io/node ===" - -# From https://github.com/sandstorm-io/sandstorm/blob/master/branch.conf -SANDSTORM_BRANCH_NUMBER=0 - -# From https://github.com/sandstorm-io/sandstorm/blob/master/release.sh -SANDSTORM_CHANNEL=dev -SANDSTORM_LAST_BUILD=$(curl -fs https://install.sandstorm.io/$SANDSTORM_CHANNEL) - -echo "=== LATEST SANDSTORM RELEASE: ${SANDSTORM_LAST_BUILD}===" - -if (( SANDSTORM_LAST_BUILD / 1000 > SANDSTORM_BRANCH_NUMBER )); then - echo "SANDSTORM BRANCH ERROR: $CHANNEL has already moved past this branch!" >&2 - echo " I refuse to replace it with an older branch." >&2 - exit 1 -fi - -BASE_BUILD=$(( BRANCH_NUMBER * 1000 )) -BUILD=$(( BASE_BUILD > LAST_BUILD ? BASE_BUILD : LAST_BUILD + 1 )) -BUILD_MINOR="$(( $BUILD % 1000 ))" -DISPLAY_VERSION="${BRANCH_NUMBER}.${BUILD_MINOR}" -TAG_NAME="v${DISPLAY_VERSION}" -SIGNING_KEY_ID=160D2D577518B58D94C9800B63F227499DA8CCBD - -TARBALL=sandstorm-$SANDSTORM_LAST_BUILD.tar.xz -NODE_EXE=sandstorm-$SANDSTORM_LAST_BUILD/bin/node - -echo "=== DOWNLOADING SANDSTORM GPG KEYS TO VERIFY SANDSTORM RELEASE ===" - -# Do verification in custom GPG workspace -# https://docs.sandstorm.io/en/latest/install/#option-3-pgp-verified-install -export GNUPGHOME=$(mktemp -d) - -curl https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-keyring.gpg | \ - gpg --import - -wget https://raw.githubusercontent.com/sandstorm-io/sandstorm/master/keys/release-certificate.kentonv.sig - -gpg --decrypt release-certificate.kentonv.sig - -echo "=== DOWNLOADING SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL} ===" -wget https://dl.sandstorm.io/$TARBALL - -echo "=== DOWNLOADING SIGNATURE FOR SANDSTORM RELEASE FROM https://dl.sandstorm.io/${TARBALL}.sig ===" -wget https://dl.sandstorm.io/$TARBALL.sig - -echo "=== VERIFYING SIGNATURE OF SANDSTORM RELEASE ===" -gpg --verify $TARBALL.sig $TARBALL - -if [ $? -eq 0 ] -then - echo "=== ALL IS WELL. GOOD SIGNATURE IN SANDSTORM. ===" -else - echo "=== PROBLEM WITH SANDSTORM SIGNATURE. ===" - exit 1 -fi - -echo "=== EXTRACTING NODE FROM SANDSTORM RELEASE TARBALL ===" -# --strip 2 removes path of 2 subdirectories -tar -xf $TARBALL $NODE_EXE --strip=2 - -echo "=== REMOVING SANDSTORM RELEASE TARBALL AND SIGNATURE ===" -rm $TARBALL $TARBALL.sig release-certificate.kentonv.si* -- cgit v1.2.3-1-g7c22 From ee81775dc8306a9e88d6c7573864f12269f78c01 Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 15:55:19 +0200 Subject: Adding SSO CAS to Wekan --- .meteor/packages | 1 + .meteor/versions | 1 + client/components/main/layouts.jade | 3 +++ client/components/main/layouts.js | 17 +++++++++++++++++ i18n/en.i18n.json | 1 + settings.json | 1 + 6 files changed, 24 insertions(+) create mode 100644 settings.json diff --git a/.meteor/packages b/.meteor/packages index 8f83280f..e76e15fb 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -85,3 +85,4 @@ browser-policy eluck:accounts-lockout rzymek:fullcalendar momentjs:moment@2.22.2 +atoy40:accounts-cas \ No newline at end of file diff --git a/.meteor/versions b/.meteor/versions index a173e7e4..9de09a74 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -9,6 +9,7 @@ aldeed:simple-schema@1.5.3 alethes:pages@1.8.6 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 +atoy40:accounts-cas@0.0.2 audit-argument-checks@1.0.7 autoupdate@1.3.12 babel-compiler@6.24.7 diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 4d76aabb..911f23f4 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -17,6 +17,9 @@ template(name="userFormsLayout") img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") section.auth-dialog +Template.dynamic(template=content) + if isCas + .at-form + button#cas(class='at-btn submit' type='submit') {{casSignInLabel}} div.at-form-lang select.select-lang.js-userform-set-language each languages diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index f12718a7..ab47c8ed 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -39,6 +39,16 @@ Template.userFormsLayout.helpers({ const curLang = T9n.getLanguage() || 'en'; return t9nTag === curLang; }, + + isCas() { + return Meteor.settings.public && + Meteor.settings.public.cas && + Meteor.settings.public.cas.loginUrl + }, + + casSignInLabel() { + return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en'); + }, }); Template.userFormsLayout.events({ @@ -47,6 +57,13 @@ Template.userFormsLayout.events({ T9n.setLanguage(i18nTagToT9n(i18nTag)); evt.preventDefault(); }, + 'click button#cas'() { + Meteor.loginWithCas(function() { + if (FlowRouter.getRouteName() == 'atSignIn') { + FlowRouter.go('/'); + } + }); + }, }); Template.defaultLayout.events({ diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 51a9b4cc..fa95f162 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -131,6 +131,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn" : "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/settings.json b/settings.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file -- cgit v1.2.3-1-g7c22 From 49a89b80cfec69d715e8b13db540d10c9fa97ffe Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 16:08:18 +0200 Subject: Fix QA --- client/components/main/layouts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index ab47c8ed..943a94e7 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -43,7 +43,7 @@ Template.userFormsLayout.helpers({ isCas() { return Meteor.settings.public && Meteor.settings.public.cas && - Meteor.settings.public.cas.loginUrl + Meteor.settings.public.cas.loginUrl; }, casSignInLabel() { @@ -59,7 +59,7 @@ Template.userFormsLayout.events({ }, 'click button#cas'() { Meteor.loginWithCas(function() { - if (FlowRouter.getRouteName() == 'atSignIn') { + if (FlowRouter.getRouteName() ==== 'atSignIn') { FlowRouter.go('/'); } }); -- cgit v1.2.3-1-g7c22 From 122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 3 Jul 2018 17:19:13 +0300 Subject: - Revert "Fix vertical align of user avatar initials", so that initials are again visible. Thanks to pravdomil and xet7 ! Reverts https://github.com/wekan/wekan/pull/1714 --- client/components/users/userAvatar.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index df2ac461..83e2c8d0 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -17,7 +17,7 @@ template(name="userAvatar") template(name="userAvatarInitials") svg.avatar.avatar-initials(viewBox="0 0 {{viewPortWidth}} 15") - text(x="50%" y="50%" text-anchor="middle" alignment-baseline="central")= initials + text(x="50%" y="13" text-anchor="middle")= initials template(name="userPopup") .board-member-menu -- cgit v1.2.3-1-g7c22 From 02f14d967f3f1cdd633131a31782297ef564a6d8 Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 16:21:51 +0200 Subject: =?UTF-8?q?Fix=20stupid=20error=20=F0=9F=92=A5=F0=9F=97=AF?= =?UTF-8?q?=F0=9F=92=A3=F0=9F=95=B3=F0=9F=92=A2=E2=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/main/layouts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 943a94e7..6d6e616d 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -59,7 +59,7 @@ Template.userFormsLayout.events({ }, 'click button#cas'() { Meteor.loginWithCas(function() { - if (FlowRouter.getRouteName() ==== 'atSignIn') { + if (FlowRouter.getRouteName() === 'atSignIn') { FlowRouter.go('/'); } }); -- cgit v1.2.3-1-g7c22 From 067aef9de948ef0cb6037d52602100b00d214706 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 3 Jul 2018 23:33:28 +0300 Subject: Fix warning about missing space in jade file. Thanks to xet7 ! --- client/components/sidebar/sidebarFilters.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 514870b8..f11528b1 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -52,9 +52,9 @@ template(name="filterSidebar") li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}") a.name.js-toggle-custom-fields-filter span.sidebar-list-item-description - {{ name }} + | {{ name }} if Filter.customFields.isSelected _id - i.fa.fa-check + i.fa.fa-check hr span {{_ 'advanced-filter-label'}} input.js-field-advanced-filter(type="text") -- cgit v1.2.3-1-g7c22 From 177c00e97427ab6280b3c6f3acd84cda5167a23c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 3 Jul 2018 23:40:31 +0300 Subject: - Fix warning about missing space in jade file. Thanks to xet7 ! --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91c52200..0fac4a69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706); +* [Revert "[Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714)", so that [initials are again + visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df). + +Thanks to GitHub users pravdomil and xet7 for their contributions. + # v1.11 2018-06-30 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22 From dd324aa581bed7ea31f20968c6b596f373e7054f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 3 Jul 2018 23:57:05 +0300 Subject: - Fix lint warning: EditCardDate is assigned a value but never used no-unused-vars Thanks to xet7 ! --- client/components/cards/cardDate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index 02ea09ae..b0f2baa3 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -1,5 +1,5 @@ // Edit received, start, due & end dates -const EditCardDate = BlazeComponent.extendComponent({ +BlazeComponent.extendComponent({ template() { return 'editCardDate'; }, -- cgit v1.2.3-1-g7c22 From c997786e6435a7e5728eab32c0e24bd458db75ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 4 Jul 2018 00:01:05 +0300 Subject: - Fix lint warning: EditCardDate is assigned a value but never used no-unused-vars Thanks to xet7 ! --- CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fac4a69..b23eb958 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,11 @@ This release fixes the following bugs: -* [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706); -* [Revert "[Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714)", so that [initials are again - visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df). +- [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706); +- Revert [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714), so that [initials are again + visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df); +- Fix lint warning: [EditCardDate is assigned a value but never used + no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f). Thanks to GitHub users pravdomil and xet7 for their contributions. -- cgit v1.2.3-1-g7c22 From 515c9be051272b91563c6de516424a246503853a Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 21:57:17 +0300 Subject: - Fix Minimize board sidebar actually just moves it over. Thanks to dagomar ! Closes #1589 --- CHANGELOG.md | 5 +++-- client/components/boards/boardBody.styl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b23eb958..1c3a038c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,10 @@ This release fixes the following bugs: - Revert [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714), so that [initials are again visible](https://github.com/wekan/wekan/commit/122a61b3333fb77c0f08bbdc6fe0d3c2f6db97df); - Fix lint warning: [EditCardDate is assigned a value but never used - no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f). + no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f); +- Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589). -Thanks to GitHub users pravdomil and xet7 for their contributions. +Thanks to GitHub users dagomar, pravdomil and xet7 for their contributions. # v1.11 2018-06-30 Wekan release diff --git a/client/components/boards/boardBody.styl b/client/components/boards/boardBody.styl index a614c7ed..148c6ce1 100644 --- a/client/components/boards/boardBody.styl +++ b/client/components/boards/boardBody.styl @@ -15,12 +15,13 @@ position() .board-wrapper position: cover - overflow-y: hidden; + overflow-x: hidden + overflow-y: hidden .board-canvas position: cover transition: margin .1s - overflow-y: auto; + overflow-y: auto &.is-sibling-sidebar-open margin-right: 248px -- cgit v1.2.3-1-g7c22 From 7e4fddd9325331092cf7a982f64f1d6ef83ebfbd Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 22:49:25 +0300 Subject: Update translations. --- i18n/ar.i18n.json | 26 ++++++++++++++++++++++++-- i18n/bg.i18n.json | 26 ++++++++++++++++++++++++-- i18n/br.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ca.i18n.json | 26 ++++++++++++++++++++++++-- i18n/cs.i18n.json | 26 ++++++++++++++++++++++++-- i18n/de.i18n.json | 26 ++++++++++++++++++++++++-- i18n/el.i18n.json | 26 ++++++++++++++++++++++++-- i18n/en-GB.i18n.json | 26 ++++++++++++++++++++++++-- i18n/en.i18n.json | 4 ++-- i18n/eo.i18n.json | 26 ++++++++++++++++++++++++-- i18n/es-AR.i18n.json | 26 ++++++++++++++++++++++++-- i18n/es.i18n.json | 26 ++++++++++++++++++++++++-- i18n/eu.i18n.json | 26 ++++++++++++++++++++++++-- i18n/fa.i18n.json | 26 ++++++++++++++++++++++++-- i18n/fi.i18n.json | 26 ++++++++++++++++++++++++-- i18n/fr.i18n.json | 26 ++++++++++++++++++++++++-- i18n/gl.i18n.json | 26 ++++++++++++++++++++++++-- i18n/he.i18n.json | 26 ++++++++++++++++++++++++-- i18n/hu.i18n.json | 26 ++++++++++++++++++++++++-- i18n/hy.i18n.json | 26 ++++++++++++++++++++++++-- i18n/id.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ig.i18n.json | 26 ++++++++++++++++++++++++-- i18n/it.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ja.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ka.i18n.json | 26 ++++++++++++++++++++++++-- i18n/km.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ko.i18n.json | 26 ++++++++++++++++++++++++-- i18n/lv.i18n.json | 26 ++++++++++++++++++++++++-- i18n/mn.i18n.json | 26 ++++++++++++++++++++++++-- i18n/nb.i18n.json | 26 ++++++++++++++++++++++++-- i18n/nl.i18n.json | 26 ++++++++++++++++++++++++-- i18n/pl.i18n.json | 26 ++++++++++++++++++++++++-- i18n/pt-BR.i18n.json | 26 ++++++++++++++++++++++++-- i18n/pt.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ro.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ru.i18n.json | 26 ++++++++++++++++++++++++-- i18n/sr.i18n.json | 26 ++++++++++++++++++++++++-- i18n/sv.i18n.json | 26 ++++++++++++++++++++++++-- i18n/ta.i18n.json | 26 ++++++++++++++++++++++++-- i18n/th.i18n.json | 26 ++++++++++++++++++++++++-- i18n/tr.i18n.json | 26 ++++++++++++++++++++++++-- i18n/uk.i18n.json | 26 ++++++++++++++++++++++++-- i18n/vi.i18n.json | 26 ++++++++++++++++++++++++-- i18n/zh-CN.i18n.json | 26 ++++++++++++++++++++++++-- i18n/zh-TW.i18n.json | 26 ++++++++++++++++++++++++-- 45 files changed, 1058 insertions(+), 90 deletions(-) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 47c120e8..5f423ddf 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -2,6 +2,7 @@ "accept": "اقبلboard", "act-activity-notify": "[Wekan] اشعار عن نشاط", "act-addAttachment": "ربط __attachment__ الى __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "علق على __comment__ : __card__", @@ -41,6 +42,7 @@ "activity-removed": "حذف %s إلى %s", "activity-sent": "إرسال %s إلى %s", "activity-unjoined": "غادر %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "أضاف قائمة تحقق إلى %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "أضف", @@ -48,6 +50,7 @@ "add-board": "إضافة لوحة", "add-card": "إضافة بطاقة", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "إضافة قائمة تدقيق", "add-checklist-item": "إضافة عنصر إلى قائمة التحقق", "add-cover": "إضافة غلاف", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "تغيير كلمة المرور", "changePermissionsPopup-title": "تعديل الصلاحيات", "changeSettingsPopup-title": "تغيير الاعدادات", + "subtasks": "Subtasks", "checklists": "قوائم التّدقيق", "click-to-star": "اضغط لإضافة اللوحة للمفضلة.", "click-to-unstar": "اضغط لحذف اللوحة من المفضلة.", @@ -163,7 +167,8 @@ "comment-only": "التعليق فقط", "comment-only-desc": "يمكن التعليق على بطاقات فقط.", "computer": "حاسوب", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "نسخ رابط البطاقة إلى الحافظة", "copyCardPopup-title": "نسخ البطاقة", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index c2874364..69fe5188 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Известия за дейности", "act-addAttachment": "прикачи __attachment__ към __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "добави списък със задачи __checklist__ към __card__", "act-addChecklistItem": "добави __checklistItem__ към списък със задачи __checklist__ в __card__", "act-addComment": "Коментира в __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "премахна %s от %s", "activity-sent": "изпрати %s до %s", "activity-unjoined": "вече не е част от %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "добави списък със задачи към %s", "activity-checklist-item-added": "добави точка към '%s' в/във %s", "add": "Добави", @@ -48,6 +50,7 @@ "add-board": "Добави Табло", "add-card": "Добави карта", "add-swimlane": "Добави коридор", + "add-subtask": "Add Subtask", "add-checklist": "Добави списък със задачи", "add-checklist-item": "Добави точка към списъка със задачи", "add-cover": "Добави корица", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Промени паролата", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Промяна на настройките", + "subtasks": "Subtasks", "checklists": "Списъци със задачи", "click-to-star": "Click to star this board.", "click-to-unstar": "Натиснете, за да премахнете това табло от любими.", @@ -163,7 +167,8 @@ "comment-only": "Само коментар", "comment-only-desc": "Може да коментира само в карти.", "computer": "Компютър", - "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда", "copyCardPopup-title": "Копирай картата", "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index fa2c25e2..a1043e89 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -2,6 +2,7 @@ "accept": "Asantiñ", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Ouzhpenn", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Ouzphenn ur golo", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Kemmañ ger-tremen", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 5badc85e..6cceb936 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -2,6 +2,7 @@ "accept": "Accepta", "act-activity-notify": "[Wekan] Notificació d'activitat", "act-addAttachment": "adjuntat __attachment__ a __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "afegida la checklist _checklist__ a __card__", "act-addChecklistItem": "afegit __checklistItem__ a la checklist __checklist__ on __card__", "act-addComment": "comentat a __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "ha eliminat %s de %s", "activity-sent": "ha enviat %s %s", "activity-unjoined": "desassignat %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "Checklist afegida a %s", "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s", "add": "Afegeix", @@ -48,6 +50,7 @@ "add-board": "Afegeix Tauler", "add-card": "Afegeix fitxa", "add-swimlane": "Afegix Carril de Natació", + "add-subtask": "Add Subtask", "add-checklist": "Afegeix checklist", "add-checklist-item": "Afegeix un ítem", "add-cover": "Afegeix coberta", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Canvia la contrasenya", "changePermissionsPopup-title": "Canvia permisos", "changeSettingsPopup-title": "Canvia configuració", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Fes clic per destacar aquest tauler.", "click-to-unstar": "Fes clic per deixar de destacar aquest tauler.", @@ -163,7 +167,8 @@ "comment-only": "Només comentaris", "comment-only-desc": "Només pots fer comentaris a les fitxes", "computer": "Ordinador", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copia l'enllaç de la ftixa al porta-retalls", "copyCardPopup-title": "Copia la fitxa", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index f067e9d3..61b5402c 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -2,6 +2,7 @@ "accept": "Přijmout", "act-activity-notify": "[Wekan] Notifikace aktivit", "act-addAttachment": "přiložen __attachment__ do __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "přidán checklist __checklist__ do __card__", "act-addChecklistItem": "přidán __checklistItem__ do checklistu __checklist__ v __card__", "act-addComment": "komentář k __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "odstraněn %s z %s", "activity-sent": "%s posláno na %s", "activity-unjoined": "odpojen %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "přidán checklist do %s", "activity-checklist-item-added": "přidána položka checklist do '%s' v %s", "add": "Přidat", @@ -48,6 +50,7 @@ "add-board": "Přidat tablo", "add-card": "Přidat kartu", "add-swimlane": "Přidat Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Přidat zaškrtávací seznam", "add-checklist-item": "Přidat položku do zaškrtávacího seznamu", "add-cover": "Přidat obal", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Změnit heslo", "changePermissionsPopup-title": "Změnit oprávnění", "changeSettingsPopup-title": "Změnit nastavení", + "subtasks": "Subtasks", "checklists": "Checklisty", "click-to-star": "Kliknutím přidat hvězdičku tomuto tablu.", "click-to-unstar": "Kliknutím odebrat hvězdičku tomuto tablu.", @@ -163,7 +167,8 @@ "comment-only": "Pouze komentáře", "comment-only-desc": "Může přidávat komentáře pouze do karet.", "computer": "Počítač", - "confirm-checklist-delete-dialog": "Opravdu chcete smazat tento checklist?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti", "copyCardPopup-title": "Kopírovat kartu", "copyChecklistToManyCardsPopup-title": "Kopírovat checklist do více karet", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Smazat tablo?", - "delete-board": "Smazat tablo" + "delete-board": "Smazat tablo", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 2ae21b93..ac7f544b 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -2,6 +2,7 @@ "accept": "Akzeptieren", "act-activity-notify": "[Wekan] Aktivitätsbenachrichtigung", "act-addAttachment": "hat __attachment__ an __card__ angehängt", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "hat die Checkliste __checklist__ zu __card__ hinzugefügt", "act-addChecklistItem": "hat __checklistItem__ zur Checkliste __checklist__ in __card__ hinzugefügt", "act-addComment": "hat __card__ kommentiert: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "hat %s von %s entfernt", "activity-sent": "hat %s an %s gesendet", "activity-unjoined": "hat %s verlassen", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "hat eine Checkliste zu %s hinzugefügt", "activity-checklist-item-added": "hat eine Checklistenposition zu '%s' in %s hinzugefügt", "add": "Hinzufügen", @@ -48,6 +50,7 @@ "add-board": "neues Board", "add-card": "Karte hinzufügen", "add-swimlane": "Swimlane hinzufügen", + "add-subtask": "Add Subtask", "add-checklist": "Checkliste hinzufügen", "add-checklist-item": "Position zu einer Checkliste hinzufügen", "add-cover": "Cover hinzufügen", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Passwort ändern", "changePermissionsPopup-title": "Berechtigungen ändern", "changeSettingsPopup-title": "Einstellungen ändern", + "subtasks": "Subtasks", "checklists": "Checklisten", "click-to-star": "Klicken Sie, um das Board mit einem Stern zu markieren.", "click-to-unstar": "Klicken Sie, um den Stern vom Board zu entfernen.", @@ -163,7 +167,8 @@ "comment-only": "Nur kommentierbar", "comment-only-desc": "Kann Karten nur Kommentieren", "computer": "Computer", - "confirm-checklist-delete-dialog": "Sind Sie sicher, dass Sie die Checkliste löschen möchten?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage", "copyCardPopup-title": "Karte kopieren", "copyChecklistToManyCardsPopup-title": "Checklistenvorlage in mehrere Karten kopieren", @@ -475,5 +480,22 @@ "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.", "delete-board-confirm-popup": "Alle Listen, Karten, Labels und Akivitäten werden gelöscht und Sie können die Inhalte des Boards nicht wiederherstellen! Die Aktion kann nicht rückgängig gemacht werden.", "boardDeletePopup-title": "Board löschen?", - "delete-board": "Board löschen" + "delete-board": "Board löschen", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index cd00671a..0cfb4b25 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Προσθήκη", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Προσθήκη Κάρτας", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Αλλαγή Κωδικού", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Αλλαγή Ρυθμίσεων", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Υπολογιστής", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 0fe7b237..f900def4 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached _ attachment _ to _ card _", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 9afadd29..d5488ad0 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -167,8 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index a0897302..3d8000c4 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -2,6 +2,7 @@ "accept": "Akcepti", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "Sendis %s al %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Aldoni", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Ŝangi pasvorton", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Ŝanĝi agordojn", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Komputilo", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 97a740e2..95553e31 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -2,6 +2,7 @@ "accept": "Aceptar", "act-activity-notify": "[Wekan] Notificación de Actividad", "act-addAttachment": "adjunto __attachment__ a __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "lista de ítems __checklist__ agregada a __card__", "act-addChecklistItem": " __checklistItem__ agregada a lista de ítems __checklist__ en __card__", "act-addComment": "comentado en __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "eliminadas %s de %s", "activity-sent": "enviadas %s a %s", "activity-unjoined": "separadas %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "agregada lista de tareas a %s", "activity-checklist-item-added": "agregado item de lista de tareas a '%s' en %s", "add": "Agregar", @@ -48,6 +50,7 @@ "add-board": "Agregar Tablero", "add-card": "Agregar Tarjeta", "add-swimlane": "Agregar Calle", + "add-subtask": "Add Subtask", "add-checklist": "Agregar Lista de Tareas", "add-checklist-item": "Agregar ítem a lista de tareas", "add-cover": "Agregar Portadas", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Cambiar Contraseña", "changePermissionsPopup-title": "Cambiar Permisos", "changeSettingsPopup-title": "Cambiar Opciones", + "subtasks": "Subtasks", "checklists": "Listas de ítems", "click-to-star": "Clickeá para darle una estrella a este tablero.", "click-to-unstar": "Clickeá para sacarle la estrella al tablero.", @@ -163,7 +167,8 @@ "comment-only": "Comentar solamente", "comment-only-desc": "Puede comentar en tarjetas solamente.", "computer": "Computadora", - "confirm-checklist-delete-dialog": "¿Estás segur@ que querés borrar la lista de ítems?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copiar enlace a tarjeta en el portapapeles", "copyCardPopup-title": "Copiar Tarjeta", "copyChecklistToManyCardsPopup-title": "Copiar Plantilla Checklist a Muchas Tarjetas", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index fa4f2f11..67f4d46e 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -2,6 +2,7 @@ "accept": "Aceptar", "act-activity-notify": "[Wekan] Notificación de actividad", "act-addAttachment": "ha adjuntado __attachment__ a __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "ha añadido la lista de verificación __checklist__ a __card__", "act-addChecklistItem": "ha añadido __checklistItem__ a la lista de verificación __checklist__ en __card__", "act-addComment": "ha comentado en __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "ha eliminado %s de %s", "activity-sent": "ha enviado %s a %s", "activity-unjoined": "se ha desvinculado de %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "ha añadido una lista de verificación a %s", "activity-checklist-item-added": "ha añadido el elemento de la lista de verificación a '%s' en %s", "add": "Añadir", @@ -48,6 +50,7 @@ "add-board": "Añadir tablero", "add-card": "Añadir una tarjeta", "add-swimlane": "Añadir un carril de flujo", + "add-subtask": "Add Subtask", "add-checklist": "Añadir una lista de verificación", "add-checklist-item": "Añadir un elemento a la lista de verificación", "add-cover": "Añadir portada", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Cambiar la contraseña", "changePermissionsPopup-title": "Cambiar los permisos", "changeSettingsPopup-title": "Cambiar las preferencias", + "subtasks": "Subtasks", "checklists": "Lista de verificación", "click-to-star": "Haz clic para destacar este tablero.", "click-to-unstar": "Haz clic para dejar de destacar este tablero.", @@ -163,7 +167,8 @@ "comment-only": "Sólo comentarios", "comment-only-desc": "Solo puedes comentar en las tarjetas.", "computer": "el ordenador", - "confirm-checklist-delete-dialog": "¿Seguro que desea eliminar la lista de verificación?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copiar el enlace de la tarjeta al portapapeles", "copyCardPopup-title": "Copiar la tarjeta", "copyChecklistToManyCardsPopup-title": "Copiar la plantilla de la lista de verificación en varias tarjetas", @@ -475,5 +480,22 @@ "board-delete-notice": "Se eliminarán todas las listas, tarjetas y acciones asociadas a este tablero. Esta acción no puede deshacerse.", "delete-board-confirm-popup": "Se eliminarán todas las listas, tarjetas, etiquetas y actividades, y no podrás recuperar los contenidos del tablero. Esta acción no puede deshacerse.", "boardDeletePopup-title": "¿Borrar el tablero?", - "delete-board": "Borrar el tablero" + "delete-board": "Borrar el tablero", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 9bd3510a..9ca140d8 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -2,6 +2,7 @@ "accept": "Onartu", "act-activity-notify": "[Wekan] Jarduera-jakinarazpena", "act-addAttachment": "__attachment__ __card__ txartelera erantsita", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "gehituta checklist __checklist__ __card__ -ri", "act-addChecklistItem": "gehituta __checklistItem__ checklist __checklist__ on __card__ -ri", "act-addComment": "__card__ txartelean iruzkina: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s %s(e)tik kenduta", "activity-sent": "%s %s(e)ri bidalita", "activity-unjoined": "%s utzita", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "egiaztaketa zerrenda %s(e)ra gehituta", "activity-checklist-item-added": "egiaztaketa zerrendako elementuak '%s'(e)ra gehituta %s(e)n", "add": "Gehitu", @@ -48,6 +50,7 @@ "add-board": "Gehitu arbela", "add-card": "Gehitu txartela", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Gehitu egiaztaketa zerrenda", "add-checklist-item": "Gehitu elementu bat egiaztaketa zerrendara", "add-cover": "Gehitu azala", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Aldatu pasahitza", "changePermissionsPopup-title": "Aldatu baimenak", "changeSettingsPopup-title": "Aldatu ezarpenak", + "subtasks": "Subtasks", "checklists": "Egiaztaketa zerrenda", "click-to-star": "Egin klik arbel honi izarra jartzeko", "click-to-unstar": "Egin klik arbel honi izarra kentzeko", @@ -163,7 +167,8 @@ "comment-only": "Iruzkinak besterik ez", "comment-only-desc": "Iruzkinak txarteletan soilik egin ditzake", "computer": "Ordenagailua", - "confirm-checklist-delete-dialog": "Ziur zaude kontrol-zerrenda ezabatu nahi duzula", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kopiatu txartela arbelera", "copyCardPopup-title": "Kopiatu txartela", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index caa87ded..481a56ac 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -2,6 +2,7 @@ "accept": "پذیرش", "act-activity-notify": "[wekan] اطلاع فعالیت", "act-addAttachment": "پیوست __attachment__ به __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "سیاهه __checklist__ به __card__ افزوده شد", "act-addChecklistItem": "__checklistItem__ به سیاهه __checklist__ در __card__ افزوده شد", "act-addComment": "درج نظر برای __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s از %s حذف شد", "activity-sent": "ارسال %s به %s", "activity-unjoined": "قطع اتصال %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "سیاهه به %s اضافه شد", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "افزودن", @@ -48,6 +50,7 @@ "add-board": "افزودن برد", "add-card": "افزودن کارت", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "افزودن چک لیست", "add-checklist-item": "افزودن مورد به سیاهه", "add-cover": "جلد کردن", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "تغییر کلمه عبور", "changePermissionsPopup-title": "تغییر دسترسی‌ها", "changeSettingsPopup-title": "تغییر تنظیمات", + "subtasks": "Subtasks", "checklists": "سیاهه‌ها", "click-to-star": "با کلیک کردن ستاره بدهید", "click-to-unstar": "با کلیک کردن ستاره را کم کنید", @@ -163,7 +167,8 @@ "comment-only": "فقط نظر", "comment-only-desc": "فقط می‌تواند روی کارت‌ها نظر دهد.", "computer": "رایانه", - "confirm-checklist-delete-dialog": "مطمئنید که می‌خواهید سیاهه را حذف کنید؟", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "درج پیوند کارت در حافظه", "copyCardPopup-title": "کپی کارت", "copyChecklistToManyCardsPopup-title": "کپی قالب کارت به کارت‌های متعدد", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 34e58d1b..3677dacb 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -2,6 +2,7 @@ "accept": "Hyväksy", "act-activity-notify": "[Wekan] Toimintailmoitus", "act-addAttachment": "liitetty __attachment__ kortille __card__", + "act-addSubtask": "lisätty alitehtävä __checklist__ kortille __card__", "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__", "act-addChecklistItem": "lisätty kohta __checklistItem__ tarkistuslistaan __checklist__ kortilla __card__", "act-addComment": "kommentoitu __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "poistettu %s kohteesta %s", "activity-sent": "lähetetty %s kohteeseen %s", "activity-unjoined": "peruttu %s liittyminen", + "activity-subtask-added": "lisätty alitehtävä kohteeseen %s", "activity-checklist-added": "lisätty tarkistuslista kortille %s", "activity-checklist-item-added": "lisäsi kohdan tarkistuslistaan '%s' kortilla %s", "add": "Lisää", @@ -48,6 +50,7 @@ "add-board": "Lisää taulu", "add-card": "Lisää kortti", "add-swimlane": "Lisää Swimlane", + "add-subtask": "Lisää alitehtävä", "add-checklist": "Lisää tarkistuslista", "add-checklist-item": "Lisää kohta tarkistuslistaan", "add-cover": "Lisää kansi", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Vaihda salasana", "changePermissionsPopup-title": "Muokkaa oikeuksia", "changeSettingsPopup-title": "Muokkaa asetuksia", + "subtasks": "Alitehtävät", "checklists": "Tarkistuslistat", "click-to-star": "Klikkaa merkataksesi tämä taulu tähdellä.", "click-to-unstar": "Klikkaa poistaaksesi tähtimerkintä taululta.", @@ -163,7 +167,8 @@ "comment-only": "Vain kommentointi", "comment-only-desc": "Voi vain kommentoida kortteja", "computer": "Tietokone", - "confirm-checklist-delete-dialog": "Haluatko varmasti poistaa tarkistuslistan", + "confirm-subtask-delete-dialog": "Oletko varma että haluat poistaa alitehtävän?", + "confirm-checklist-delete-dialog": "Oletko varma että haluat poistaa tarkistuslistan?", "copy-card-link-to-clipboard": "Kopioi kortin linkki leikepöydälle", "copyCardPopup-title": "Kopioi kortti", "copyChecklistToManyCardsPopup-title": "Kopioi tarkistuslistan malli monille korteille", @@ -475,5 +480,22 @@ "board-delete-notice": "Poistaminen on lopullista. Menetät kaikki listat, kortit ja toimet tällä taululla.", "delete-board-confirm-popup": "Kaikki listat, kortit, tunnisteet ja toimet poistetaan ja et pysty palauttamaan taulun sisältöä. Tätä ei voi peruuttaa.", "boardDeletePopup-title": "Poista taulu?", - "delete-board": "Poista taulu" + "delete-board": "Poista taulu", + "default-subtasks-board": "Alitehtävät __board__ taululle", + "default": "Oletus", + "queue": "Jono", + "subtask-settings": "Alitehtävä asetukset", + "boardSubtaskSettingsPopup-title": "Taulu alitehtävien asetukset", + "show-subtasks-field": "Korteilla voi olla alitehtäviä", + "deposit-subtasks-board": "Tallenta alitehtävät tälle taululle:", + "deposit-subtasks-list": "Laskeutumislista alatehtäville tallennettu tänne:", + "show-parent-in-minicard": "Näytä ylätehtävä minikortilla:", + "prefix-with-full-path": "Etuliite koko polulla", + "prefix-with-parent": "Etuliite ylätehtävällä", + "subtext-with-full-path": "Aliteksti koko polulla", + "subtext-with-parent": "Aliteksti ylätehtävällä", + "change-card-parent": "Muuta kortin ylätehtävää", + "parent-card": "Ylätehtävä kortti", + "source-board": "Lähdetaulu", + "no-parent": "Älä näytä ylätehtävää" } \ No newline at end of file diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index cae8c836..22a3e8cf 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -2,6 +2,7 @@ "accept": "Accepter", "act-activity-notify": "[Wekan] Notification d'activité", "act-addAttachment": "a joint __attachment__ à __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "a ajouté la checklist __checklist__ à __card__", "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de __card__", "act-addComment": "a commenté __card__ : __comment__", @@ -41,6 +42,7 @@ "activity-removed": "a supprimé %s de %s", "activity-sent": "a envoyé %s vers %s", "activity-unjoined": "a quitté %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "a ajouté une checklist à %s", "activity-checklist-item-added": "a ajouté un élément à la checklist '%s' dans %s", "add": "Ajouter", @@ -48,6 +50,7 @@ "add-board": "Ajouter un tableau", "add-card": "Ajouter une carte", "add-swimlane": "Ajouter un couloir", + "add-subtask": "Add Subtask", "add-checklist": "Ajouter une checklist", "add-checklist-item": "Ajouter un élément à la checklist", "add-cover": "Ajouter la couverture", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Modifier le mot de passe", "changePermissionsPopup-title": "Modifier les permissions", "changeSettingsPopup-title": "Modifier les paramètres", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Cliquez pour ajouter ce tableau aux favoris.", "click-to-unstar": "Cliquez pour retirer ce tableau des favoris.", @@ -163,7 +167,8 @@ "comment-only": "Commentaire uniquement", "comment-only-desc": "Ne peut que commenter des cartes.", "computer": "Ordinateur", - "confirm-checklist-delete-dialog": "Êtes-vous sûr de vouloir supprimer la checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copier le lien vers la carte dans le presse-papier", "copyCardPopup-title": "Copier la carte", "copyChecklistToManyCardsPopup-title": "Copier le modèle de checklist vers plusieurs cartes", @@ -475,5 +480,22 @@ "board-delete-notice": "La suppression est définitive. Vous perdrez toutes vos listes, cartes et actions associées à ce tableau.", "delete-board-confirm-popup": "Toutes les listes, cartes, étiquettes et activités seront supprimées et vous ne pourrez pas retrouver le contenu du tableau. Il n'y a pas d'annulation possible.", "boardDeletePopup-title": "Supprimer le tableau ?", - "delete-board": "Supprimer le tableau" + "delete-board": "Supprimer le tableau", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 25e3e662..5422314d 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -2,6 +2,7 @@ "accept": "Aceptar", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Engadir", @@ -48,6 +50,7 @@ "add-board": "Engadir taboleiro", "add-card": "Engadir tarxeta", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Cambiar o contrasinal", "changePermissionsPopup-title": "Cambiar os permisos", "changeSettingsPopup-title": "Cambiar a configuración", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computador", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 6d5dd812..f15c7f9b 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -2,6 +2,7 @@ "accept": "אישור", "act-activity-notify": "[Wekan] הודעת פעילות", "act-addAttachment": " __attachment__ צורף לכרטיס __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "רשימת משימות __checklist__ נוספה ל __card__", "act-addChecklistItem": " __checklistItem__ נוסף לרשימת משימות __checklist__ בכרטיס __card__", "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s הוסר מ%s", "activity-sent": "%s נשלח ל%s", "activity-unjoined": "בטל צירוף %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "נוספה רשימת משימות אל %s", "activity-checklist-item-added": "נוסף פריט רשימת משימות אל ‚%s‘ תחת %s", "add": "הוספה", @@ -48,6 +50,7 @@ "add-board": "הוספת לוח", "add-card": "הוספת כרטיס", "add-swimlane": "הוספת מסלול", + "add-subtask": "Add Subtask", "add-checklist": "הוספת רשימת מטלות", "add-checklist-item": "הוספת פריט לרשימת משימות", "add-cover": "הוספת כיסוי", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "החלפת ססמה", "changePermissionsPopup-title": "שינוי הרשאות", "changeSettingsPopup-title": "שינוי הגדרות", + "subtasks": "Subtasks", "checklists": "רשימות", "click-to-star": "יש ללחוץ להוספת הלוח למועדפים.", "click-to-unstar": "יש ללחוץ להסרת הלוח מהמועדפים.", @@ -163,7 +167,8 @@ "comment-only": "הערה בלבד", "comment-only-desc": "ניתן להעיר על כרטיסים בלבד.", "computer": "מחשב", - "confirm-checklist-delete-dialog": "האם אתה בטוח שברצונך למחוק את רשימת המשימות", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "העתקת קישור הכרטיס ללוח הגזירים", "copyCardPopup-title": "העתק כרטיס", "copyChecklistToManyCardsPopup-title": "העתקת תבנית רשימת מטלות למגוון כרטיסים", @@ -475,5 +480,22 @@ "board-delete-notice": "מחיקה היא לצמיתות. כל הרשימות, הכרטיבים והפעולות שקשורים בלוח הזה ילכו לאיבוד.", "delete-board-confirm-popup": "כל הרשימות, הכרטיסים, התווית והפעולות יימחקו ולא תהיה לך דרך לשחזר את תכני הלוח. אין אפשרות לבטל.", "boardDeletePopup-title": "למחוק את הלוח?", - "delete-board": "מחיקת לוח" + "delete-board": "מחיקת לוח", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index e14e7995..07379611 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -2,6 +2,7 @@ "accept": "Elfogadás", "act-activity-notify": "[Wekan] Tevékenység értesítés", "act-addAttachment": "__attachment__ mellékletet csatolt a kártyához: __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "__checklist__ ellenőrzőlistát adott hozzá a kártyához: __card__", "act-addChecklistItem": "__checklistItem__ elemet adott hozzá a(z) __checklist__ ellenőrzőlistához ezen a kártyán: __card__", "act-addComment": "hozzászólt a(z) __card__ kártyán: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s eltávolítva innen: %s", "activity-sent": "%s elküldve ide: %s", "activity-unjoined": "%s kilépett a csoportból", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "ellenőrzőlista hozzáadva ehhez: %s", "activity-checklist-item-added": "ellenőrzőlista elem hozzáadva ehhez: „%s”, ebben: %s", "add": "Hozzáadás", @@ -48,6 +50,7 @@ "add-board": "Tábla hozzáadása", "add-card": "Kártya hozzáadása", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Ellenőrzőlista hozzáadása", "add-checklist-item": "Elem hozzáadása az ellenőrzőlistához", "add-cover": "Borító hozzáadása", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Jelszó megváltoztatása", "changePermissionsPopup-title": "Jogosultságok megváltoztatása", "changeSettingsPopup-title": "Beállítások megváltoztatása", + "subtasks": "Subtasks", "checklists": "Ellenőrzőlisták", "click-to-star": "Kattintson a tábla csillagozásához.", "click-to-unstar": "Kattintson a tábla csillagának eltávolításához.", @@ -163,7 +167,8 @@ "comment-only": "Csak megjegyzés", "comment-only-desc": "Csak megjegyzést írhat a kártyákhoz.", "computer": "Számítógép", - "confirm-checklist-delete-dialog": "Biztosan törölni szeretné az ellenőrzőlistát?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "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", "copyCardPopup-title": "Kártya másolása", "copyChecklistToManyCardsPopup-title": "Ellenőrzőlista sablon másolása több kártyára", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 0911aed1..124bc7dd 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -2,6 +2,7 @@ "accept": "Ընդունել", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "ավելացրել է __checklistItem__ __checklist__ on __card__-ին", "act-addComment": "մեկնաբանել է __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 3954f67c..a80444a7 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -2,6 +2,7 @@ "accept": "Terima", "act-activity-notify": "[Wekan] Pemberitahuan Kegiatan", "act-addAttachment": "Lampirkan__attachment__ke__kartu__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "Dikomentari di__kartu__:__comment__", @@ -41,6 +42,7 @@ "activity-removed": "dihapus %s dari %s", "activity-sent": "terkirim %s ke %s", "activity-unjoined": "tidak bergabung %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "daftar periksa ditambahkan ke %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Tambah", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Tambahkan hal ke daftar periksa", "add-cover": "Tambahkan Sampul", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Ubah Kata Sandi", "changePermissionsPopup-title": "Ubah Hak Akses", "changeSettingsPopup-title": "Ubah Setelan", + "subtasks": "Subtasks", "checklists": "Daftar Periksa", "click-to-star": "Klik untuk tandai bintang panel ini", "click-to-unstar": "Klik untuk tidak memberi bintang pada panel ini", @@ -163,7 +167,8 @@ "comment-only": "Hanya komentar", "comment-only-desc": "Bisa komen hanya di kartu", "computer": "Komputer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index f522a92c..90ce0668 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -2,6 +2,7 @@ "accept": "Kwere", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Tinye", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 99c84699..b067d567 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -2,6 +2,7 @@ "accept": "Accetta", "act-activity-notify": "[Wekan] Notifiche attività", "act-addAttachment": "ha allegato __attachment__ a __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "aggiunta checklist __checklist__ a __card__", "act-addChecklistItem": "aggiunto __checklistItem__ alla checklist __checklist__ di __card__", "act-addComment": "ha commentato su __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "rimosso %s da %s", "activity-sent": "inviato %s a %s", "activity-unjoined": "ha abbandonato %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "aggiunta checklist a %s", "activity-checklist-item-added": "Aggiunto l'elemento checklist a '%s' in %s", "add": "Aggiungere", @@ -48,6 +50,7 @@ "add-board": "Aggiungi Bacheca", "add-card": "Aggiungi Scheda", "add-swimlane": "Aggiungi Corsia", + "add-subtask": "Add Subtask", "add-checklist": "Aggiungi Checklist", "add-checklist-item": "Aggiungi un elemento alla checklist", "add-cover": "Aggiungi copertina", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Cambia password", "changePermissionsPopup-title": "Cambia permessi", "changeSettingsPopup-title": "Cambia impostazioni", + "subtasks": "Subtasks", "checklists": "Checklist", "click-to-star": "Clicca per stellare questa bacheca", "click-to-unstar": "Clicca per togliere la stella da questa bacheca", @@ -163,7 +167,8 @@ "comment-only": "Solo commenti", "comment-only-desc": "Puoi commentare solo le schede.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Sei sicuro di voler cancellare questa checklist?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copia link della scheda sulla clipboard", "copyCardPopup-title": "Copia Scheda", "copyChecklistToManyCardsPopup-title": "Copia template checklist su più schede", @@ -475,5 +480,22 @@ "board-delete-notice": "L'eliminazione è permanente. Tutte le azioni, liste e schede associate a questa bacheca andranno perse.", "delete-board-confirm-popup": "Tutte le liste, schede, etichette e azioni saranno rimosse e non sarai più in grado di recuperare il contenuto della bacheca. L'azione non è annullabile.", "boardDeletePopup-title": "Eliminare la bacheca?", - "delete-board": "Elimina bacheca" + "delete-board": "Elimina bacheca", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 4b8a6d8d..9910b002 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -2,6 +2,7 @@ "accept": "受け入れ", "act-activity-notify": "[Wekan] アクティビティ通知", "act-addAttachment": "__card__ に __attachment__ を添付しました", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "__card__ に __checklist__ を追加しました", "act-addChecklistItem": "__checklist__ on __card__ に __checklistItem__ を追加しました", "act-addComment": "__card__: __comment__ をコメントしました", @@ -41,6 +42,7 @@ "activity-removed": "%s を %s から削除しました", "activity-sent": "%s を %s に送りました", "activity-unjoined": "%s への参加を止めました", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "%s にチェックリストを追加しました", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "追加", @@ -48,6 +50,7 @@ "add-board": "ボードを追加", "add-card": "カードを追加", "add-swimlane": "スイムレーンを追加", + "add-subtask": "Add Subtask", "add-checklist": "チェックリストを追加", "add-checklist-item": "チェックリストに項目を追加", "add-cover": "カバーの追加", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "パスワードの変更", "changePermissionsPopup-title": "パーミッションの変更", "changeSettingsPopup-title": "設定の変更", + "subtasks": "Subtasks", "checklists": "チェックリスト", "click-to-star": "ボードにスターをつける", "click-to-unstar": "ボードからスターを外す", @@ -163,7 +167,8 @@ "comment-only": "コメントのみ", "comment-only-desc": "カードにのみコメント可能", "computer": "コンピューター", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "カードへのリンクをクリップボードにコピー", "copyCardPopup-title": "カードをコピー", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "すべてのリスト、カード、ラベル、アクティビティは削除され、ボードの内容を元に戻すことができません。", "boardDeletePopup-title": "ボードを削除しますか？", - "delete-board": "ボードを削除" + "delete-board": "ボードを削除", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 53c2f91a..83751851 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 9484c7cc..e1a26fcb 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -2,6 +2,7 @@ "accept": "យល់ព្រម", "act-activity-notify": "[Wekan] សកម្មភាពជូនដំណឹង", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 97963a8a..d9a980df 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -2,6 +2,7 @@ "accept": "확인", "act-activity-notify": "[Wekan] 활동 알림", "act-addAttachment": "__attachment__를 __card__에 첨부", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "__card__에 내용 추가 : __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s를 %s에서 삭제함", "activity-sent": "%s를 %s로 보냄", "activity-unjoined": "%s에서 멤버 해제", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "%s에 체크리스트를 추가함", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "추가", @@ -48,6 +50,7 @@ "add-board": "보드 추가", "add-card": "카드 추가", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "체크리스트 추가", "add-checklist-item": "체크리스트에 항목 추가", "add-cover": "커버 추가", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "암호 변경", "changePermissionsPopup-title": "권한 변경", "changeSettingsPopup-title": "설정 변경", + "subtasks": "Subtasks", "checklists": "체크리스트", "click-to-star": "보드에 별 추가.", "click-to-unstar": "보드에 별 삭제.", @@ -163,7 +167,8 @@ "comment-only": "댓글만 입력 가능", "comment-only-desc": "카드에 댓글만 달수 있습니다.", "computer": "내 컴퓨터", - "confirm-checklist-delete-dialog": "정말 이 체크리스트를 삭제할까요?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "클립보드에 카드의 링크가 복사되었습니다.", "copyCardPopup-title": "카드 복사", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 46d958cc..b79c7043 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -2,6 +2,7 @@ "accept": "Piekrist", "act-activity-notify": "[Wekan] Aktivitātes paziņojums", "act-addAttachment": "pievienots __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "pievienots checklist __checklist__ to __card__", "act-addChecklistItem": "pievienots __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "komentēja __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index b5b97822..7f0c2fc1 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -2,6 +2,7 @@ "accept": "Зөвшөөрөх", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "_attachment__ хавсралтыг __card__-д хавсаргав", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Нэмэх", @@ -48,6 +50,7 @@ "add-board": "Самбар нэмэх", "add-card": "Карт нэмэх", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Чеклист нэмэх", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Нууц үг солих", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Тохиргоо өөрчлөх", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 1d09cb7c..1838aa0f 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -2,6 +2,7 @@ "accept": "Godta", "act-activity-notify": "[Wekan] Aktivitetsvarsel", "act-addAttachment": "la ved __attachment__ til __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "kommenterte til __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "fjernet %s fra %s", "activity-sent": "sendte %s til %s", "activity-unjoined": "forlot %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "la til sjekkliste til %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Legg til", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Nytt punkt på sjekklisten", "add-cover": "Nytt omslag", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Endre passord", "changePermissionsPopup-title": "Endre tillatelser", "changeSettingsPopup-title": "Endre innstillinger", + "subtasks": "Subtasks", "checklists": "Sjekklister", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 5dd23d41..90832ea6 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -2,6 +2,7 @@ "accept": "Accepteren", "act-activity-notify": "[Wekan] Activiteit Notificatie", "act-addAttachment": "__attachment__ als bijlage toegevoegd aan __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "__checklist__ toegevoegd aan __card__", "act-addChecklistItem": "__checklistItem__ aan checklist toegevoegd aan __checklist__ op __card__", "act-addComment": "gereageerd op __card__:__comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s verwijderd van %s", "activity-sent": "%s gestuurd naar %s", "activity-unjoined": "uit %s gegaan", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "checklist toegevoegd aan %s", "activity-checklist-item-added": "checklist punt toegevoegd aan '%s' in '%s'", "add": "Toevoegen", @@ -48,6 +50,7 @@ "add-board": "Voeg Bord Toe", "add-card": "Voeg Kaart Toe", "add-swimlane": "Swimlane Toevoegen", + "add-subtask": "Add Subtask", "add-checklist": "Voeg Checklist Toe", "add-checklist-item": "Voeg item toe aan checklist", "add-cover": "Voeg Cover Toe", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Wijzig wachtwoord", "changePermissionsPopup-title": "Wijzig permissies", "changeSettingsPopup-title": "Wijzig instellingen", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Klik om het bord als favoriet in te stellen", "click-to-unstar": "Klik om het bord uit favorieten weg te halen", @@ -163,7 +167,8 @@ "comment-only": "Alleen reageren", "comment-only-desc": "Kan alleen op kaarten reageren.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Weet u zeker dat u de checklist wilt verwijderen", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kopieer kaart link naar klembord", "copyCardPopup-title": "Kopieer kaart", "copyChecklistToManyCardsPopup-title": "Checklist sjabloon kopiëren naar meerdere kaarten", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 1d52d2ee..fcaa5bab 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -2,6 +2,7 @@ "accept": "Akceptuj", "act-activity-notify": "[Wekan] Powiadomienia - aktywności", "act-addAttachment": "załączono __attachement__ do __karty__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "dodano listę zadań __checklist__ to __card__", "act-addChecklistItem": "dodano __checklistItem__ do listy zadań __checklist__ na karcie __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "usunięto %s z %s", "activity-sent": "wysłano %s z %s", "activity-unjoined": "odłączono %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Dodaj", @@ -48,6 +50,7 @@ "add-board": "Dodaj tablicę", "add-card": "Dodaj kartę", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Dodaj listę kontrolną", "add-checklist-item": "Dodaj element do listy kontrolnej", "add-cover": "Dodaj okładkę", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Zmień hasło", "changePermissionsPopup-title": "Zmień uprawnienia", "changeSettingsPopup-title": "Zmień ustawienia", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Kliknij by odznaczyć tę tablicę.", "click-to-unstar": "Kliknij by usunąć odznaczenie tej tablicy.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Komputer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Skopiuj kartę", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 15496c0d..f92f3d21 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -2,6 +2,7 @@ "accept": "Aceitar", "act-activity-notify": "[Wekan] Notificação de Atividade", "act-addAttachment": "anexo __attachment__ de __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ no __card__", "act-addChecklistItem": "adicionado __checklistitem__ para a lista de checagem __checklist__ em __card__", "act-addComment": "comentou em __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removeu %s de %s", "activity-sent": "enviou %s de %s", "activity-unjoined": "saiu de %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "Adicionado lista de verificação a %s", "activity-checklist-item-added": "adicionado o item de checklist para '%s' em %s", "add": "Novo", @@ -48,6 +50,7 @@ "add-board": "Adicionar Quadro", "add-card": "Adicionar Cartão", "add-swimlane": "Adicionar Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Adicionar Checklist", "add-checklist-item": "Adicionar um item à lista de verificação", "add-cover": "Adicionar Capa", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Alterar Senha", "changePermissionsPopup-title": "Alterar Permissões", "changeSettingsPopup-title": "Altera configurações", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Marcar quadro como favorito.", "click-to-unstar": "Remover quadro dos favoritos.", @@ -163,7 +167,8 @@ "comment-only": "Somente comentários", "comment-only-desc": "Pode comentar apenas em cartões.", "computer": "Computador", - "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar lista de verificação", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência", "copyCardPopup-title": "Copiar o cartão", "copyChecklistToManyCardsPopup-title": "Copiar modelo de checklist para vários cartões", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 9f8b9b96..0c988d43 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -2,6 +2,7 @@ "accept": "Aceitar", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Adicionar", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computador", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 0d854bbd..a70e3972 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 1b85c355..1d55aedf 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -2,6 +2,7 @@ "accept": "Принять", "act-activity-notify": "[Wekan] Уведомление о действиях участников", "act-addAttachment": "вложено __attachment__ в __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "добавил контрольный список __checklist__ в __card__", "act-addChecklistItem": "добавил __checklistItem__ в контрольный список __checklist__ в __card__", "act-addComment": "прокомментировал __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "удалил %s из %s", "activity-sent": "отправил %s в %s", "activity-unjoined": "вышел из %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "добавил контрольный список в %s", "activity-checklist-item-added": "добавил пункт контрольного списка в '%s' в карточке %s", "add": "Создать", @@ -48,6 +50,7 @@ "add-board": "Добавить доску", "add-card": "Добавить карту", "add-swimlane": "Добавить дорожку", + "add-subtask": "Add Subtask", "add-checklist": "Добавить контрольный список", "add-checklist-item": "Добавить пункт в контрольный список", "add-cover": "Прикрепить", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Изменить пароль", "changePermissionsPopup-title": "Изменить настройки доступа", "changeSettingsPopup-title": "Изменить Настройки", + "subtasks": "Subtasks", "checklists": "Контрольные списки", "click-to-star": "Добавить в «Избранное»", "click-to-unstar": "Удалить из «Избранного»", @@ -163,7 +167,8 @@ "comment-only": "Только комментирование", "comment-only-desc": "Может комментировать только карточки.", "computer": "Загрузить с компьютера", - "confirm-checklist-delete-dialog": "Вы уверены, что хотите удалить контрольный список?", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Копировать ссылку на карточку в буфер обмена", "copyCardPopup-title": "Копировать карточку", "copyChecklistToManyCardsPopup-title": "Копировать шаблон контрольного списка в несколько карточек", @@ -475,5 +480,22 @@ "board-delete-notice": "Удаление является постоянным. Вы потеряете все списки, карты и действия, связанные с этой доской.", "delete-board-confirm-popup": "Все списки, карточки, ярлыки и действия будут удалены, и вы не сможете восстановить содержимое доски. Отменить нельзя.", "boardDeletePopup-title": "Удалить доску?", - "delete-board": "Удалить доску" + "delete-board": "Удалить доску", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 853e867d..6f25bc3b 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -2,6 +2,7 @@ "accept": "Prihvati", "act-activity-notify": "[Wekan] Obaveštenje o aktivnostima", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "uklonio %s iz %s", "activity-sent": "poslao %s %s-u", "activity-unjoined": "rastavio %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "lista je dodata u %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Dodaj", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Dodaj novu stavku u listu", "add-cover": "Dodaj zaglavlje", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Izmeni podešavanja", + "subtasks": "Subtasks", "checklists": "Liste", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 164a5620..25bcf6f3 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -2,6 +2,7 @@ "accept": "Acceptera", "act-activity-notify": "[Wekan] Aktivitetsavisering", "act-addAttachment": "bifogade __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "lade till checklist __checklist__ till __card__", "act-addChecklistItem": "lade till __checklistItem__ till checklistan __checklist__ on __card__", "act-addComment": "kommenterade __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "tog bort %s från %s", "activity-sent": "skickade %s till %s", "activity-unjoined": "gick ur %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "lade kontrollista till %s", "activity-checklist-item-added": "lade checklista objekt till '%s' i %s", "add": "Lägg till", @@ -48,6 +50,7 @@ "add-board": "Lägg till anslagstavla", "add-card": "Lägg till kort", "add-swimlane": "Lägg till simbana", + "add-subtask": "Add Subtask", "add-checklist": "Lägg till checklista", "add-checklist-item": "Lägg till ett objekt till kontrollista", "add-cover": "Lägg till omslag", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Ändra lösenord", "changePermissionsPopup-title": "Ändra behörigheter", "changeSettingsPopup-title": "Ändra inställningar", + "subtasks": "Subtasks", "checklists": "Kontrollistor", "click-to-star": "Klicka för att stjärnmärka denna anslagstavla.", "click-to-unstar": "Klicka för att ta bort stjärnmärkningen från denna anslagstavla.", @@ -163,7 +167,8 @@ "comment-only": "Kommentera endast", "comment-only-desc": "Kan endast kommentera kort.", "computer": "Dator", - "confirm-checklist-delete-dialog": "Är du säker på att du vill ta bort checklista", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kopiera kortlänk till urklipp", "copyCardPopup-title": "Kopiera kort", "copyChecklistToManyCardsPopup-title": "Kopiera checklist-mallen till flera kort", @@ -475,5 +480,22 @@ "board-delete-notice": "Borttagningen är permanent. Du kommer förlora alla listor, kort och händelser kopplade till den här anslagstavlan.", "delete-board-confirm-popup": "Alla listor, kort, etiketter och aktiviteter kommer tas bort och du kommer inte kunna återställa anslagstavlans innehåll. Det går inte att ångra.", "boardDeletePopup-title": "Ta bort anslagstavla?", - "delete-board": "Ta bort anslagstavla" + "delete-board": "Ta bort anslagstavla", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 53c2f91a..83751851 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -2,6 +2,7 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Add", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Add an item to checklist", "add-cover": "Add Cover", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index e7048f6e..fcde0e71 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -2,6 +2,7 @@ "accept": "ยอมรับ", "act-activity-notify": "[Wekan] แจ้งกิจกรรม", "act-addAttachment": "แนบไฟล์ __attachment__ ไปยัง __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "ออกความเห็นที่ __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "ลบ %s จาด %s", "activity-sent": "ส่ง %s ถึง %s", "activity-unjoined": "ยกเลิกเข้าร่วม %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "รายการถูกเพิ่มไป %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "เพิ่ม", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "เพิ่มรายการตรวจสอบ", "add-cover": "เพิ่มหน้าปก", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "เปลี่ยนรหัสผ่าน", "changePermissionsPopup-title": "เปลี่ยนสิทธิ์", "changeSettingsPopup-title": "เปลี่ยนการตั้งค่า", + "subtasks": "Subtasks", "checklists": "รายการตรวจสอบ", "click-to-star": "คลิกดาวบอร์ดนี้", "click-to-unstar": "คลิกยกเลิกดาวบอร์ดนี้", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "คอมพิวเตอร์", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 03798130..c0d2026a 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -2,6 +2,7 @@ "accept": "Kabul Et", "act-activity-notify": "[Wekan] Etkinlik Bildirimi", "act-addAttachment": "__card__ kartına __attachment__ dosyasını ekledi", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "__card__ kartında __checklist__ yapılacak listesini ekledi", "act-addChecklistItem": "__checklistItem__ öğesini __card__ kartındaki __checklist__ yapılacak listesine ekledi", "act-addComment": "__card__ kartına bir yorum bıraktı: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "%s i %s ten kaldırdı", "activity-sent": "%s i %s e gönderdi", "activity-unjoined": "%s içinden ayrıldı", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "%s içine yapılacak listesi ekledi", "activity-checklist-item-added": "%s içinde %s yapılacak listesine öğe ekledi", "add": "Ekle", @@ -48,6 +50,7 @@ "add-board": "Pano Ekle", "add-card": "Kart Ekle", "add-swimlane": "Kulvar Ekle", + "add-subtask": "Add Subtask", "add-checklist": "Yapılacak Listesi Ekle", "add-checklist-item": "Yapılacak listesine yeni bir öğe ekle", "add-cover": "Kapak resmi ekle", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Parola Değiştir", "changePermissionsPopup-title": "Yetkileri Değiştirme", "changeSettingsPopup-title": "Ayarları değiştir", + "subtasks": "Subtasks", "checklists": "Yapılacak Listeleri", "click-to-star": "Bu panoyu yıldızlamak için tıkla.", "click-to-unstar": "Bu panunun yıldızını kaldırmak için tıkla.", @@ -163,7 +167,8 @@ "comment-only": "Sadece yorum", "comment-only-desc": "Sadece kartlara yorum yazabilir.", "computer": "Bilgisayar", - "confirm-checklist-delete-dialog": "Yapılacak listesini silmek istediğinize emin misiniz", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Kartın linkini kopyala", "copyCardPopup-title": "Kartı Kopyala", "copyChecklistToManyCardsPopup-title": "Yapılacaklar Listesi şemasını birden çok karta kopyala", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index ef76ed5f..459aad9e 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -2,6 +2,7 @@ "accept": "Прийняти", "act-activity-notify": "[Wekan] Сповіщення Діяльності", "act-addAttachment": "__attachment__ додане до __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "комментар в __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "removed %s from %s", "activity-sent": "sent %s to %s", "activity-unjoined": "unjoined %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "added checklist to %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Додати", @@ -48,6 +50,7 @@ "add-board": "Add Board", "add-card": "Add Card", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Add Checklist", "add-checklist-item": "Додати елемент в список", "add-cover": "Додати обкладинку", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index 320942e1..e785f0d0 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -2,6 +2,7 @@ "accept": "Chấp nhận", "act-activity-notify": "[Wekan] Thông Báo Hoạt Động", "act-addAttachment": "đã đính kèm __attachment__ vào __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "đã bình luận trong __card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "đã xóa %s từ %s", "activity-sent": "gửi %s đến %s", "activity-unjoined": "đã rời khỏi %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "đã thêm checklist vào %s", "activity-checklist-item-added": "added checklist item to '%s' in %s", "add": "Thêm", @@ -48,6 +50,7 @@ "add-board": "Thêm Bảng", "add-card": "Thêm Thẻ", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "Thêm Danh Sách Kiểm Tra", "add-checklist-item": "Thêm Một Mục Vào Danh Sách Kiểm Tra", "add-cover": "Thêm Bìa", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "Change Password", "changePermissionsPopup-title": "Change Permissions", "changeSettingsPopup-title": "Change Settings", + "subtasks": "Subtasks", "checklists": "Checklists", "click-to-star": "Click to star this board.", "click-to-unstar": "Click to unstar this board.", @@ -163,7 +167,8 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 3205f107..6ea7ee27 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -2,6 +2,7 @@ "accept": "接受", "act-activity-notify": "[Wekan] 活动通知", "act-addAttachment": "添加附件 __attachment__ 至卡片 __card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "添加清单 __checklist__ 到 __card__", "act-addChecklistItem": "向 __card__ 中的清单 __checklist__ 添加 __checklistItem__", "act-addComment": "在 __card__ 发布评论: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "从 %s 中移除 %s", "activity-sent": "发送 %s 至 %s", "activity-unjoined": "已解除 %s 关联", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "已经将清单添加到 %s", "activity-checklist-item-added": "添加清单项至'%s' 于 %s", "add": "添加", @@ -48,6 +50,7 @@ "add-board": "添加看板", "add-card": "添加卡片", "add-swimlane": "添加泳道图", + "add-subtask": "Add Subtask", "add-checklist": "添加待办清单", "add-checklist-item": "扩充清单", "add-cover": "添加封面", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "更改密码", "changePermissionsPopup-title": "更改权限", "changeSettingsPopup-title": "更改设置", + "subtasks": "Subtasks", "checklists": "清单", "click-to-star": "点此来标记该看板", "click-to-unstar": "点此来去除该看板的标记", @@ -163,7 +167,8 @@ "comment-only": "仅能评论", "comment-only-desc": "只能在卡片上评论。", "computer": "从本机上传", - "confirm-checklist-delete-dialog": "确认要删除清单吗", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "复制卡片链接到剪贴板", "copyCardPopup-title": "复制卡片", "copyChecklistToManyCardsPopup-title": "复制清单模板至多个卡片", @@ -475,5 +480,22 @@ "board-delete-notice": "删除时永久操作，将会丢失此看板上的所有列表、卡片和动作。", "delete-board-confirm-popup": "所有列表、卡片、标签和活动都回被删除，将无法恢复看板内容。不支持撤销。", "boardDeletePopup-title": "删除看板？", - "delete-board": "删除看板" + "delete-board": "删除看板", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 88e9bc18..ced49edd 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -2,6 +2,7 @@ "accept": "接受", "act-activity-notify": "[Wekan] 活動通知", "act-addAttachment": "新增附件__attachment__至__card__", + "act-addSubtask": "added subtask __checklist__ to __card__", "act-addChecklist": "added checklist __checklist__ to __card__", "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "評論__card__: __comment__", @@ -41,6 +42,7 @@ "activity-removed": "移除 %s 從 %s 中", "activity-sent": "寄送 %s 至 %s", "activity-unjoined": "解除關聯 %s", + "activity-subtask-added": "added subtask to %s", "activity-checklist-added": "新增待辦清單至 %s", "activity-checklist-item-added": "新增待辦清單項目從 %s 到 %s", "add": "新增", @@ -48,6 +50,7 @@ "add-board": "新增看板", "add-card": "新增卡片", "add-swimlane": "Add Swimlane", + "add-subtask": "Add Subtask", "add-checklist": "新增待辦清單", "add-checklist-item": "新增項目", "add-cover": "新增封面", @@ -141,6 +144,7 @@ "changePasswordPopup-title": "更改密碼", "changePermissionsPopup-title": "更改許可權", "changeSettingsPopup-title": "更改設定", + "subtasks": "Subtasks", "checklists": "待辦清單", "click-to-star": "點此來標記該看板", "click-to-unstar": "點此來去除該看板的標記", @@ -163,7 +167,8 @@ "comment-only": "只可以發表評論", "comment-only-desc": "只可以對卡片發表評論", "computer": "從本機上傳", - "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", + "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?", "copy-card-link-to-clipboard": "將卡片連結複製到剪貼板", "copyCardPopup-title": "Copy Card", "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards", @@ -475,5 +480,22 @@ "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.", "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.", "boardDeletePopup-title": "Delete Board?", - "delete-board": "Delete Board" + "delete-board": "Delete Board", + "default-subtasks-board": "Subtasks for __board__ board", + "default": "Default", + "queue": "Queue", + "subtask-settings": "Subtasks Settings", + "boardSubtaskSettingsPopup-title": "Board Subtasks Settings", + "show-subtasks-field": "Cards can have subtasks", + "deposit-subtasks-board": "Deposit subtasks to this board:", + "deposit-subtasks-list": "Landing list for subtasks deposited here:", + "show-parent-in-minicard": "Show parent in minicard:", + "prefix-with-full-path": "Prefix with full path", + "prefix-with-parent": "Prefix with parent", + "subtext-with-full-path": "Subtext with full path", + "subtext-with-parent": "Subtext with parent", + "change-card-parent": "Change card's parent", + "parent-card": "Parent card", + "source-board": "Source board", + "no-parent": "Don't show parent" } \ No newline at end of file -- cgit v1.2.3-1-g7c22 From cc753cf4e45436ca2318b1e2cb67ee7bf804c50d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 22:51:10 +0300 Subject: - Nested tasks. Thanks to TNick ! Closes #709 --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c3a038c..a47636d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release adds the following new features: + +- [Nested tasks](https://github.com/wekan/wekan/pull/1723). + +and fixes the following bugs: - [Fix warning about missing space in jade file](https://github.com/wekan/wekan/commit/067aef9de948ef0cb6037d52602100b00d214706); - Revert [Fix vertical align of user avatar initials](https://github.com/wekan/wekan/pull/1714), so that [initials are again @@ -9,7 +13,7 @@ This release fixes the following bugs: no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f); - Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589). -Thanks to GitHub users dagomar, pravdomil and xet7 for their contributions. +Thanks to GitHub users dagomar, pravdomil, TNick and xet7 for their contributions. # v1.11 2018-06-30 Wekan release -- cgit v1.2.3-1-g7c22 From cc63a575ab653814d9b211323b2fae2043a2eeca Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 23:03:48 +0300 Subject: - Calendar improvements. Thanks to TNick ! --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a47636d8..c704e31a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ This release adds the following new features: -- [Nested tasks](https://github.com/wekan/wekan/pull/1723). +- [Nested tasks](https://github.com/wekan/wekan/pull/1723); +- [Calendar improvements](https://github.com/wekan/wekan/pull/1752). and fixes the following bugs: -- cgit v1.2.3-1-g7c22 From 13e5ccb56e68eb7563b76b5f8b8eaf01b6ed552f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 23:06:02 +0300 Subject: Fix missing space in jade file. Thanks to xet7 ! --- client/components/cards/minicard.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 57913669..3f7e0940 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -14,7 +14,7 @@ template(name="minicard") .parent-prefix | {{ parentCardName }} +viewer - {{ title }} + | {{ title }} if $eq 'subtext-with-full-path' currentBoard.presentParentTask .parent-subtext | {{ parentString ' > ' }} -- cgit v1.2.3-1-g7c22 From 5986f64d7278418a78402a9e4a3ffe97826c478e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 23:23:37 +0300 Subject: Update translations. --- i18n/ar.i18n.json | 1 + i18n/bg.i18n.json | 1 + i18n/br.i18n.json | 1 + i18n/ca.i18n.json | 1 + i18n/cs.i18n.json | 1 + i18n/de.i18n.json | 1 + i18n/el.i18n.json | 1 + i18n/en-GB.i18n.json | 1 + i18n/eo.i18n.json | 1 + i18n/es-AR.i18n.json | 1 + i18n/es.i18n.json | 1 + i18n/eu.i18n.json | 1 + i18n/fa.i18n.json | 1 + i18n/fi.i18n.json | 1 + i18n/fr.i18n.json | 1 + i18n/gl.i18n.json | 1 + i18n/he.i18n.json | 1 + i18n/hu.i18n.json | 1 + i18n/hy.i18n.json | 1 + i18n/id.i18n.json | 1 + i18n/ig.i18n.json | 1 + i18n/it.i18n.json | 1 + i18n/ja.i18n.json | 1 + i18n/ka.i18n.json | 1 + i18n/km.i18n.json | 1 + i18n/ko.i18n.json | 1 + i18n/lv.i18n.json | 1 + i18n/mn.i18n.json | 1 + i18n/nb.i18n.json | 1 + i18n/nl.i18n.json | 1 + i18n/pl.i18n.json | 1 + i18n/pt-BR.i18n.json | 1 + i18n/pt.i18n.json | 1 + i18n/ro.i18n.json | 1 + i18n/ru.i18n.json | 1 + i18n/sr.i18n.json | 1 + i18n/sv.i18n.json | 1 + i18n/ta.i18n.json | 1 + i18n/th.i18n.json | 1 + i18n/tr.i18n.json | 1 + i18n/uk.i18n.json | 1 + i18n/vi.i18n.json | 1 + i18n/zh-CN.i18n.json | 1 + i18n/zh-TW.i18n.json | 1 + 44 files changed, 44 insertions(+) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 5f423ddf..53fa803b 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "المزيد", "cards": "بطاقات", "cards-count": "بطاقات", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "تعديل الصورة الشخصية", "change-password": "تغيير كلمة المرور", diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 69fe5188..c8ca3b35 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Още", "cards": "Карти", "cards-count": "Карти", + "casSignIn": "Sign In with CAS", "change": "Промени", "change-avatar": "Промени аватара", "change-password": "Промени паролата", diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index a1043e89..7b511bf1 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Muioc’h", "cards": "Kartennoù", "cards-count": "Kartennoù", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Kemmañ ger-tremen", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 6cceb936..bf891c90 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Més", "cards": "Fitxes", "cards-count": "Fitxes", + "casSignIn": "Sign In with CAS", "change": "Canvia", "change-avatar": "Canvia Avatar", "change-password": "Canvia la clau", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 61b5402c..daf21326 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Více", "cards": "Karty", "cards-count": "Karty", + "casSignIn": "Sign In with CAS", "change": "Změnit", "change-avatar": "Změnit avatar", "change-password": "Změnit heslo", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index ac7f544b..614d4b80 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mehr", "cards": "Karten", "cards-count": "Karten", + "casSignIn": "Sign In with CAS", "change": "Ändern", "change-avatar": "Profilbild ändern", "change-password": "Passwort ändern", diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index 0cfb4b25..13844004 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Περισσότερα", "cards": "Κάρτες", "cards-count": "Κάρτες", + "casSignIn": "Sign In with CAS", "change": "Αλλαγή", "change-avatar": "Change Avatar", "change-password": "Αλλαγή Κωδικού", diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index f900def4..937fc657 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 3d8000c4..ef7c6476 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Pli", "cards": "Kartoj", "cards-count": "Kartoj", + "casSignIn": "Sign In with CAS", "change": "Ŝanĝi", "change-avatar": "Change Avatar", "change-password": "Ŝangi pasvorton", diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 95553e31..64935585 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mas", "cards": "Tarjetas", "cards-count": "Tarjetas", + "casSignIn": "Sign In with CAS", "change": "Cambiar", "change-avatar": "Cambiar Avatar", "change-password": "Cambiar Contraseña", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 67f4d46e..6f2d6cd6 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Más", "cards": "Tarjetas", "cards-count": "Tarjetas", + "casSignIn": "Sign In with CAS", "change": "Cambiar", "change-avatar": "Cambiar el avatar", "change-password": "Cambiar la contraseña", diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 9ca140d8..08729670 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Gehiago", "cards": "Txartelak", "cards-count": "Txartelak", + "casSignIn": "Sign In with CAS", "change": "Aldatu", "change-avatar": "Aldatu avatarra", "change-password": "Aldatu pasahitza", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 481a56ac..2cd998be 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "بیشتر", "cards": "کارت‌ها", "cards-count": "کارت‌ها", + "casSignIn": "Sign In with CAS", "change": "تغییر", "change-avatar": "تغییر تصویر", "change-password": "تغییر کلمه عبور", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 3677dacb..2b1e9286 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Lisää", "cards": "Kortit", "cards-count": "korttia", + "casSignIn": "CAS kirjautuminen", "change": "Muokkaa", "change-avatar": "Muokkaa profiilikuvaa", "change-password": "Vaihda salasana", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 22a3e8cf..c783490d 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Plus", "cards": "Cartes", "cards-count": "Cartes", + "casSignIn": "Sign In with CAS", "change": "Modifier", "change-avatar": "Modifier l'avatar", "change-password": "Modifier le mot de passe", diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 5422314d..aec06426 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Máis", "cards": "Tarxetas", "cards-count": "Tarxetas", + "casSignIn": "Sign In with CAS", "change": "Cambiar", "change-avatar": "Cambiar o avatar", "change-password": "Cambiar o contrasinal", diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index f15c7f9b..c035fd1e 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "עוד", "cards": "כרטיסים", "cards-count": "כרטיסים", + "casSignIn": "Sign In with CAS", "change": "שינוי", "change-avatar": "החלפת תמונת משתמש", "change-password": "החלפת ססמה", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 07379611..3e3f3903 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Több", "cards": "Kártyák", "cards-count": "Kártyák", + "casSignIn": "Sign In with CAS", "change": "Változtatás", "change-avatar": "Avatár megváltoztatása", "change-password": "Jelszó megváltoztatása", diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 124bc7dd..a56db758 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index a80444a7..06076aa5 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Lainnya", "cards": "Daftar Kartu", "cards-count": "Daftar Kartu", + "casSignIn": "Sign In with CAS", "change": "Ubah", "change-avatar": "Ubah Avatar", "change-password": "Ubah Kata Sandi", diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 90ce0668..5b759739 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Gbanwe", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index b067d567..7968967d 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Altro", "cards": "Schede", "cards-count": "Schede", + "casSignIn": "Sign In with CAS", "change": "Cambia", "change-avatar": "Cambia avatar", "change-password": "Cambia password", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 9910b002..c70b0d35 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "さらに見る", "cards": "カード", "cards-count": "カード", + "casSignIn": "Sign In with CAS", "change": "変更", "change-avatar": "アバターの変更", "change-password": "パスワードの変更", diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 83751851..f2b32e0f 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index e1a26fcb..e0838ffc 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index d9a980df..ddcc3c0c 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "더보기", "cards": "카드", "cards-count": "카드", + "casSignIn": "Sign In with CAS", "change": "변경", "change-avatar": "아바타 변경", "change-password": "암호 변경", diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index b79c7043..abeec5ad 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index 7f0c2fc1..f2f093b3 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Аватар өөрчлөх", "change-password": "Нууц үг солих", diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 1838aa0f..72bd0430 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mer", "cards": "Kort", "cards-count": "Kort", + "casSignIn": "Sign In with CAS", "change": "Endre", "change-avatar": "Endre avatar", "change-password": "Endre passord", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 90832ea6..6a54b9c5 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Meer", "cards": "Kaarten", "cards-count": "Kaarten", + "casSignIn": "Sign In with CAS", "change": "Wijzig", "change-avatar": "Wijzig avatar", "change-password": "Wijzig wachtwoord", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index fcaa5bab..a12a5389 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Więcej", "cards": "Karty", "cards-count": "Karty", + "casSignIn": "Sign In with CAS", "change": "Zmień", "change-avatar": "Zmień Avatar", "change-password": "Zmień hasło", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index f92f3d21..6135ae54 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mais", "cards": "Cartões", "cards-count": "Cartões", + "casSignIn": "Sign In with CAS", "change": "Alterar", "change-avatar": "Alterar Avatar", "change-password": "Alterar Senha", diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 0c988d43..0d6df67e 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mais", "cards": "Cartões", "cards-count": "Cartões", + "casSignIn": "Sign In with CAS", "change": "Alterar", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index a70e3972..8146ee3b 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 1d55aedf..577d7b43 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Поделиться", "cards": "Карточки", "cards-count": "Карточки", + "casSignIn": "Sign In with CAS", "change": "Изменить", "change-avatar": "Изменить аватар", "change-password": "Изменить пароль", diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 6f25bc3b..db8e9792 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 25bcf6f3..7d0fa978 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Mera", "cards": "Kort", "cards-count": "Kort", + "casSignIn": "Sign In with CAS", "change": "Ändra", "change-avatar": "Ändra avatar", "change-password": "Ändra lösenord", diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 83751851..f2b32e0f 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index fcde0e71..86e3a65d 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "เพิ่มเติม", "cards": "การ์ด", "cards-count": "การ์ด", + "casSignIn": "Sign In with CAS", "change": "เปลี่ยน", "change-avatar": "เปลี่ยนภาพ", "change-password": "เปลี่ยนรหัสผ่าน", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index c0d2026a..c1e2d7f8 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "Daha", "cards": "Kartlar", "cards-count": "Kartlar", + "casSignIn": "Sign In with CAS", "change": "Değiştir", "change-avatar": "Avatar Değiştir", "change-password": "Parola Değiştir", diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 459aad9e..d2b27f81 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index e785f0d0..43852935 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn": "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 6ea7ee27..bbc060fb 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "更多", "cards": "卡片", "cards-count": "卡片", + "casSignIn": "Sign In with CAS", "change": "变更", "change-avatar": "更改头像", "change-password": "更改密码", diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index ced49edd..e8bcbd2c 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -134,6 +134,7 @@ "cardMorePopup-title": "更多", "cards": "卡片", "cards-count": "卡片", + "casSignIn": "Sign In with CAS", "change": "變更", "change-avatar": "更改大頭貼", "change-password": "更改密碼", -- cgit v1.2.3-1-g7c22 From a4ca6dce256042e87e3bb400d563db075e14cc58 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 5 Jul 2018 23:25:13 +0300 Subject: - SSO CAS. Thanks to ppoulard ! Closes #620 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c704e31a..4ba46b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ This release adds the following new features: - [Nested tasks](https://github.com/wekan/wekan/pull/1723); -- [Calendar improvements](https://github.com/wekan/wekan/pull/1752). +- [Calendar improvements](https://github.com/wekan/wekan/pull/1752); +- [SSO CAS](https://github.com/wekan/wekan/pull/1742). and fixes the following bugs: @@ -14,7 +15,7 @@ and fixes the following bugs: no-unused-vars](https://github.com/wekan/wekan/commit/dd324aa581bed7ea31f20968c6b596f373e7054f); - Fix [Minimize board sidebar actually just moves it over](https://github.com/wekan/wekan/issues/1589). -Thanks to GitHub users dagomar, pravdomil, TNick and xet7 for their contributions. +Thanks to GitHub users dagomar, ppoulard, pravdomil, TNick and xet7 for their contributions. # v1.11 2018-06-30 Wekan release -- cgit v1.2.3-1-g7c22 From 62e5e5db49c94ba6b4a26aa96a48dd7bd216a351 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 6 Jul 2018 01:03:51 +0300 Subject: v1.12 --- CHANGELOG.md | 2 +- Dockerfile | 4 ++-- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ba46b67..9e84c537 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.12 2018-07-06 Wekan release This release adds the following new features: diff --git a/Dockerfile b/Dockerfile index 8b8b6a09..6d68867d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG SRC_PATH # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" -ENV NODE_VERSION ${NODE_VERSION:-v8.11.1} +ENV NODE_VERSION ${NODE_VERSION:-v8.11.3} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} @@ -48,7 +48,7 @@ RUN \ # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ - echo "308d0caaef0a1da3e98d1a1615016aad9659b3caf31d0f09ced20cabedb8acbf node-v8.11.1-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ + echo "40e7990489c13a1ed1173d8fe03af258c6ed964b92a4bd59a0927ac5931054aa node-v8.11.3-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \ \ # Verify nodejs authenticity grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ diff --git a/package.json b/package.json index 117baa70..c96b3208 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.11.0", + "version": "1.12.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 22f53168..fc1db3ee 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 96, + appVersion = 97, # Increment this for every release. - appMarketingVersion = (defaultText = "1.11.0~2018-06-30"), + appMarketingVersion = (defaultText = "1.12.0~2018-07-06"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22 From 5220111822913bbaa0378d5272f66608aad7b097 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 6 Jul 2018 01:14:02 +0300 Subject: v1.13 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- snapcraft.yaml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e84c537..371cf9ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.13 2018-07-06 Wekan release + +This release adds the following new features: + +- Added snapcraft.yml new node version changes, that were missing from v1.12. + +Thanks to GitHub user xet7 for contibutions. + # v1.12 2018-07-06 Wekan release This release adds the following new features: diff --git a/package.json b/package.json index c96b3208..a37e5edd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.12.0", + "version": "1.13.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index fc1db3ee..e066fdee 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 97, + appVersion = 98, # Increment this for every release. - appMarketingVersion = (defaultText = "1.12.0~2018-07-06"), + appMarketingVersion = (defaultText = "1.13.0~2018-07-06"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index b1895701..70b9d44d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -110,7 +110,7 @@ parts: # Fiber.poolSize = 1e9; # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm # Description at https://releases.wekan.team/node.txt - echo "13baa1b3114a5ea3248875e0f36cb46fcf8acd212de1fb74ba68ef4c9a4e1d93 node" >> node-SHASUMS256.txt.asc + echo "5263dc1c571885921179b11a1c6eb9ca82a95a89b69c15b366f885e9b5a32d66 node" >> node-SHASUMS256.txt.asc curl https://releases.wekan.team/node -o node # Verify Fibers patched node authenticity echo "Fibers 100% CPU issue patched node authenticity:" -- cgit v1.2.3-1-g7c22