summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md10
-rw-r--r--Stackerfile.yml2
-rw-r--r--client/components/rules/actions/cardActions.jade6
-rw-r--r--client/components/rules/actions/cardActions.js24
-rw-r--r--client/components/swimlanes/swimlanes.styl1
-rw-r--r--i18n/es.i18n.json22
-rw-r--r--i18n/pt.i18n.json38
-rw-r--r--i18n/ru.i18n.json10
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
10 files changed, 63 insertions, 56 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f21f4465..268803e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
-# Upcoming Wekan release
+# v2.04 2019-01-26 Wekan release
-WAITING FOR BUGFIX:
+This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
-- [Bugfix to swimlanes](https://github.com/wekan/wekan/pull/2126#issuecomment-457723923), IN PROGRESS, NOT READY YET.
+- [Bugfix for swimlanes, simplify setting color, fix rendering on Firefox](https://github.com/wekan/wekan/pull/2132).
-# ON HOLD, WAITING FOR BUGFIX IN v2.04. (was: v2.03 2019-01-25 Wekan release)
+Thanks to GitHub user bentiss for contributions, and translators for their translations.
+
+# Not released because of [bug](https://github.com/wekan/wekan/pull/2126#issuecomment-457723923): v2.03 2019-01-25 Wekan
This release adds the following new features with Apache I-CLA, thanks to bentiss:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 887e7649..6855581e 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.03.0"
+appVersion: "v2.04.0"
files:
userUploads:
- README.md
diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade
index 1fee5231..8c6defc6 100644
--- a/client/components/rules/actions/cardActions.jade
+++ b/client/components/rules/actions/cardActions.jade
@@ -39,8 +39,10 @@ template(name="cardActions")
div.trigger-content
div.trigger-text
| {{{_'r-set-color'}}}
- button.trigger-button.trigger-button-color.card-details-green.js-show-color-palette(id="color-action")
- | {{{_'color-green'}}}
+ button.trigger-button.trigger-button-color.js-show-color-palette(
+ id="color-action"
+ class="card-details-{{cardColorButton}}")
+ | {{{_ cardColorButtonText }}}
div.trigger-button.js-set-color-action.js-goto-rules
i.fa.fa-plus
diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index 6c858358..a1e43c38 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -6,6 +6,15 @@ Meteor.startup(() => {
BlazeComponent.extendComponent({
onCreated() {
this.subscribe('allRules');
+ this.cardColorButtonValue = new ReactiveVar('green');
+ },
+
+ cardColorButton() {
+ return this.cardColorButtonValue.get();
+ },
+
+ cardColorButtonText() {
+ return `color-${ this.cardColorButtonValue.get() }`;
},
labels() {
@@ -128,11 +137,7 @@ BlazeComponent.extendComponent({
'click .js-set-color-action' (event) {
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
- const colorButton = this.find('#color-action');
- if (colorButton.value === '') {
- colorButton.value = 'green';
- }
- const selectedColor = colorButton.value;
+ const selectedColor = this.cardColorButtonValue.get();
const boardId = Session.get('currentBoard');
const desc = Utils.getTriggerActionDesc(event, this);
const triggerId = Triggers.insert(trigger);
@@ -157,8 +162,8 @@ BlazeComponent.extendComponent({
BlazeComponent.extendComponent({
onCreated() {
this.currentAction = this.currentData();
- this.colorButton = Popup.getOpenerComponent().find('#color-action');
- this.currentColor = new ReactiveVar(this.colorButton.value);
+ this.colorButtonValue = Popup.getOpenerComponent().cardColorButtonValue;
+ this.currentColor = new ReactiveVar(this.colorButtonValue.get());
},
colors() {
@@ -175,10 +180,7 @@ BlazeComponent.extendComponent({
this.currentColor.set(this.currentData().color);
},
'click .js-submit' () {
- this.colorButton.classList.remove(`card-details-${ this.colorButton.value }`);
- this.colorButton.value = this.currentColor.get();
- this.colorButton.innerText = `${TAPi18n.__(`color-${ this.currentColor.get() }`)}`;
- this.colorButton.classList.add(`card-details-${ this.colorButton.value }`);
+ this.colorButtonValue.set(this.currentColor.get());
Popup.close();
},
}];
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index e4e2cd3b..19613ad9 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -53,6 +53,7 @@
.list-group
flex-direction: row
height: 100%
+ overflow: hidden
swimlane-color(background, color...)
background: background !important
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index c40e418b..700560ab 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -192,7 +192,7 @@
"color-slateblue": "azul",
"color-white": "blanco",
"color-yellow": "amarilla",
- "unset-color": "Unset",
+ "unset-color": "Desmarcar",
"comment": "Comentar",
"comment-placeholder": "Escribir comentario",
"comment-only": "Sólo comentarios",
@@ -306,7 +306,7 @@
"from-wekan": "Desde exportación previa",
"import-board-instruction-trello": "En tu tablero de Trello, ve a 'Menú', luego 'Más' > 'Imprimir y exportar' > 'Exportar JSON', y copia el texto resultante.",
"import-board-instruction-wekan": "En tu tablero, vete a 'Menú', luego 'Exportar tablero', y copia el texto en el archivo descargado.",
- "import-board-instruction-about-errors": "Si obtiene errores cuando importe el tablero, a veces la importación funciona igualmente, y el tablero se encuentra en la página de Todos los Tableros.",
+ "import-board-instruction-about-errors": "Aunque obtengas errores cuando importes el tablero, a veces la importación funciona igualmente, y el tablero se encontrará en la página de tableros.",
"import-json-placeholder": "Pega tus datos JSON válidos aquí",
"import-map-members": "Mapa de miembros",
"import-members-map": "Tu tablero importado tiene algunos miembros. Por favor, mapea los miembros que quieres importar con tus usuarios.",
@@ -335,10 +335,10 @@
"list-archive-cards-pop": "Esto eliminará del tablero todas las tarjetas en esta lista. Para ver las tarjetas en el Archivo y recuperarlas al tablero haga click en \"Menu\" > \"Archivo\"",
"list-move-cards": "Mover todas las tarjetas de esta lista",
"list-select-cards": "Seleccionar todas las tarjetas de esta lista",
- "set-color-list": "Set Color",
+ "set-color-list": "Cambiar el color",
"listActionPopup-title": "Acciones de la lista",
"swimlaneActionPopup-title": "Acciones del carril de flujo",
- "swimlaneAddPopup-title": "Add a Swimlane below",
+ "swimlaneAddPopup-title": "Añadir un carril de flujo debajo",
"listImportCardPopup-title": "Importar una tarjeta de Trello",
"listMorePopup-title": "Más",
"link-list": "Enlazar a esta lista",
@@ -404,9 +404,9 @@
"rules": "Reglas",
"search-cards": "Buscar entre los títulos y las descripciones de las tarjetas en este tablero.",
"search-example": "¿Texto a buscar?",
- "select-color": "Selecciona un color",
+ "select-color": "Seleccionar el color",
"set-wip-limit-value": "Fija un límite para el número máximo de tareas en esta lista.",
- "setWipLimitPopup-title": "Fijar el límite del trabajo en proceso",
+ "setWipLimitPopup-title": "Fija el límite del trabajo en proceso",
"shortcut-assign-self": "Asignarte a ti mismo a la tarjeta actual",
"shortcut-autocomplete-emoji": "Autocompletar emoji",
"shortcut-autocomplete-members": "Autocompletar miembros",
@@ -519,10 +519,10 @@
"card-end-on": "Finalizado el",
"editCardReceivedDatePopup-title": "Cambiar la fecha de recepción",
"editCardEndDatePopup-title": "Cambiar la fecha de finalización",
- "setCardColorPopup-title": "Cambiar color",
- "setCardActionsColorPopup-title": "Choose a color",
- "setSwimlaneColorPopup-title": "Choose a color",
- "setListColorPopup-title": "Choose a color",
+ "setCardColorPopup-title": "Cambiar el color",
+ "setCardActionsColorPopup-title": "Elegir un color",
+ "setSwimlaneColorPopup-title": "Elegir un color",
+ "setListColorPopup-title": "Elegir un color",
"assigned-by": "Asignado por",
"requested-by": "Solicitado por",
"board-delete-notice": "Se eliminarán todas las listas, tarjetas y acciones asociadas a este tablero. Esta acción no puede deshacerse.",
@@ -601,7 +601,7 @@
"r-label": "etiqueta",
"r-member": "miembro",
"r-remove-all": "Eliminar todos los miembros de la tarjeta",
- "r-set-color": "Cambiar color a",
+ "r-set-color": "Cambiar el color a",
"r-checklist": "lista de verificación",
"r-check-all": "Marcar todo",
"r-uncheck-all": "Desmarcar todo",
diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json
index 290a649b..4da76fd7 100644
--- a/i18n/pt.i18n.json
+++ b/i18n/pt.i18n.json
@@ -1,24 +1,24 @@
{
"accept": "Aceitar",
- "act-activity-notify": "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__",
- "act-createBoard": "created __board__",
- "act-createCard": "added __card__ to __list__",
- "act-createCustomField": "created custom field __customField__",
- "act-createList": "added __list__ to __board__",
- "act-addBoardMember": "added __member__ to __board__",
- "act-archivedBoard": "__board__ moved to Archive",
- "act-archivedCard": "__card__ moved to Archive",
- "act-archivedList": "__list__ moved to Archive",
- "act-archivedSwimlane": "__swimlane__ moved to Archive",
- "act-importBoard": "imported __board__",
- "act-importCard": "imported __card__",
- "act-importList": "imported __list__",
- "act-joinMember": "added __member__ to __card__",
+ "act-activity-notify": "Notificação de Actividade",
+ "act-addAttachment": "anexado __attachment__ ao __card__",
+ "act-addSubtask": "adicionou sub-tarefa __checklist__ ao __card__",
+ "act-addChecklist": "adicionou checklist __checklist__ ao __card__",
+ "act-addChecklistItem": "adicionou __checklistItem__ à checklist __checklist__ no __card__",
+ "act-addComment": "comentou em __card__: __comment__",
+ "act-createBoard": "criou __board__",
+ "act-createCard": "adicionou __card__ à __list__",
+ "act-createCustomField": "criou o campo customizado __customField__",
+ "act-createList": "adicionou __list__ a __board__",
+ "act-addBoardMember": "adicionou __member__ a __board__",
+ "act-archivedBoard": "__board__ arquivado",
+ "act-archivedCard": "__card__ arquivado",
+ "act-archivedList": "__list__ arquivada",
+ "act-archivedSwimlane": "__swimlane__ arquivada",
+ "act-importBoard": "__board__ importado",
+ "act-importCard": "__card__ importado",
+ "act-importList": "__list__ importada",
+ "act-joinMember": "__member__ adicionado ao __card__",
"act-moveCard": "moved __card__ from __oldList__ to __list__",
"act-removeBoardMember": "removed __member__ from __board__",
"act-restoredCard": "restored __card__ to __board__",
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index fba09b2c..a588ba2f 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -335,10 +335,10 @@
"list-archive-cards-pop": "Это действие удалит все карточки из этого списка с доски. Чтобы просмотреть карточки в Архиве и вернуть их на доску, нажмите “Меню” > “Архив”.",
"list-move-cards": "Переместить все карточки в этом списке",
"list-select-cards": "Выбрать все карточки в этом списке",
- "set-color-list": "Set Color",
+ "set-color-list": "Задать цвет",
"listActionPopup-title": "Список действий",
"swimlaneActionPopup-title": "Действия с дорожкой",
- "swimlaneAddPopup-title": "Add a Swimlane below",
+ "swimlaneAddPopup-title": "Добавить дорожку ниже",
"listImportCardPopup-title": "Импортировать Trello карточку",
"listMorePopup-title": "Поделиться",
"link-list": "Ссылка на список",
@@ -520,9 +520,9 @@
"editCardReceivedDatePopup-title": "Изменить дату получения",
"editCardEndDatePopup-title": "Изменить дату завершения",
"setCardColorPopup-title": "Задать цвет",
- "setCardActionsColorPopup-title": "Choose a color",
- "setSwimlaneColorPopup-title": "Choose a color",
- "setListColorPopup-title": "Choose a color",
+ "setCardActionsColorPopup-title": "Выберите цвет",
+ "setSwimlaneColorPopup-title": "Выберите цвет",
+ "setListColorPopup-title": "Выберите цвет",
"assigned-by": "Поручил",
"requested-by": "Запросил",
"board-delete-notice": "Удаление является постоянным. Вы потеряете все списки, карты и действия, связанные с этой доской.",
diff --git a/package.json b/package.json
index fa458059..d9de1ff6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v2.03.0",
+ "version": "v2.04.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 4acdaafd..df483323 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 = 205,
+ appVersion = 206,
# Increment this for every release.
- appMarketingVersion = (defaultText = "2.03.0~2019-01-25"),
+ appMarketingVersion = (defaultText = "2.04.0~2019-01-26"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-25 21:21:04 +0000