diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-26 09:40:43 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-26 09:40:43 +0300 |
commit | 82a01edc543d3c3d7aa9ae62fbf3177ebdac4e53 (patch) | |
tree | de68cd6a423a5a99a432d18f94d15e1fa7d4e3f7 | |
parent | 9eaac52b7331ea45768d91795f360751746ec5b5 (diff) | |
parent | 9ff2340cdb7ffead4a6454a66799ce81dfacc910 (diff) | |
download | wekan-82a01edc543d3c3d7aa9ae62fbf3177ebdac4e53.tar.gz wekan-82a01edc543d3c3d7aa9ae62fbf3177ebdac4e53.tar.bz2 wekan-82a01edc543d3c3d7aa9ae62fbf3177ebdac4e53.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 14 | ||||
-rw-r--r-- | Dockerfile | 13 | ||||
-rw-r--r-- | client/components/cards/cardDate.js | 5 | ||||
-rw-r--r-- | i18n/es.i18n.json | 6 | ||||
-rw-r--r-- | i18n/fr.i18n.json | 4 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
-rw-r--r-- | snapcraft.yaml | 21 |
8 files changed, 47 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6698a16a..422cb2eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# v1.02 2018-05-26 Wekan release + +This release fixes the following bugs: + +* [Remove binary version of bcrypt](https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac) + because of [vulnerability](https://nodesecurity.io/advisories/612) that has [issue that is not fixed + yet](https://github.com/kelektiv/node.bcrypt.js/issues/604) + and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606). + This may cause some slowdown; +* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660); +* [Fix Received Date and End Date on Cards](https://github.com/wekan/wekan/issues/1654). + +Thanks to GitHub users kubiko, xadagaras and xet7 for their contributions. + # v1.01 2018-05-23 Wekan release This release possibly fixes the following bugs, please test: @@ -19,7 +19,7 @@ ENV NODE_VERSION ${NODE_VERSION:-v8.11.1} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} -ENV NPM_VERSION ${NPM_VERSION:-6.0.1} +ENV NPM_VERSION ${NPM_VERSION:-latest} ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} @@ -125,12 +125,15 @@ RUN \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ - cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ - gosu wekan:wekan rm -rf node_modules/bcrypt && \ - gosu wekan:wekan npm install bcrypt && \ + #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. + #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac + #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c + #cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ + #gosu wekan:wekan rm -rf node_modules/bcrypt && \ + #gosu wekan:wekan npm install bcrypt && \ cd /home/wekan/app_build/bundle/programs/server/ && \ gosu wekan:wekan npm install && \ - gosu wekan:wekan npm install bcrypt && \ + #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ # Cleanup diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index f33e8c19..52a48f47 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -93,7 +93,7 @@ Template.dateBadge.helpers({ }); // editCardReceivedDatePopup -(class extends EditCardDate { +(class extends DatePicker { onCreated() { super.onCreated(); this.data().receivedAt && this.date.set(moment(this.data().receivedAt)); @@ -156,7 +156,7 @@ Template.dateBadge.helpers({ }).register('editCardDueDatePopup'); // editCardEndDatePopup -(class extends EditCardDate { +(class extends DatePicker { onCreated() { super.onCreated(); this.data().endAt && this.date.set(moment(this.data().endAt)); @@ -355,4 +355,3 @@ CardEndDate.register('cardEndDate'); return this.date.get().format('l'); } }).register('minicardEndDate'); - diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 5411be6e..69735004 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -243,11 +243,11 @@ "filter-no-label": "Sin etiqueta", "filter-no-member": "Sin miembro", "filter-no-custom-fields": "Sin campos personalizados", - "filter-on": "Filtro activado", + "filter-on": "Filtrado activado", "filter-on-desc": "Estás filtrando tarjetas en este tablero. Haz clic aquí para editar el filtro.", "filter-to-selection": "Filtrar la selección", - "advanced-filter-label": "Advanced Filter", - "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. Also you can combine multiple conditions. For Example: F1 == V1 || F1 = V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 and ( F2 == V2 || F2 == V3 )", + "advanced-filter-label": "Filtrado avanzado", + "advanced-filter-description": "El filtrado avanzado permite escribir una cadena que contiene los siguientes operadores: == != <= >= && || ( ) Se utiliza un espacio como separador entre los operadores. Se pueden filtrar todos los campos personalizados escribiendo sus nombres y valores. Por ejemplo: Campo1 == Valor1. Nota: Si los campos o valores contienen espacios, debe encapsularlos entre comillas simples. Por ejemplo: 'Campo 1' == 'Valor 1'. También puedes combinar múltiples condiciones. Por ejemplo: C1 == V1 || C1 = V2. Normalmente todos los operadores se interpretan de izquierda a derecha. Puede cambiar el orden colocando corchetes. Por ejemplo: C1 == V1 y ( C2 == V2 || C2 == V3 )", "fullname": "Nombre completo", "header-logo-title": "Volver a tu página de tableros", "hide-system-messages": "Ocultar las notificaciones de actividad", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 5f95f7cf..f68fdf85 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -246,8 +246,8 @@ "filter-on": "Le filtre est actif", "filter-on-desc": "Vous êtes en train de filtrer les cartes sur ce tableau. Cliquez ici pour modifier les filtres.", "filter-to-selection": "Filtre vers la sélection", - "advanced-filter-label": "Advanced Filter", - "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. Also you can combine multiple conditions. For Example: F1 == V1 || F1 = V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 and ( F2 == V2 || F2 == V3 )", + "advanced-filter-label": "Filtre avancé", + "advanced-filter-description": "Le filtre avancé permet d'écrire une chaîne contenant les opérateur suivants : == != <= >= && || ( ). Les opérateurs doivent être séparés par des espaces. Vous pouvez filtrer tous les champs personnalisés en saisissant leur nom et leur valeur. Par exemple : champ1 == valeur1. Note : si des champs ou valeurs contiennent des espaces, vous devez les mettre entre apostrophes. Par exemple : 'champ 1' = 'valeur 1'. Il est également possible de combiner plusieurs conditions. Par exemple : f1 == v1 || f2 == v2. Normalement, tous les opérateurs sont interprétés de gauche à droite. Vous pouvez changer l'ordre à l'aide de parenthèses. Par exemple : f1 == v1 and (f2 == v2 || f2 == v3).", "fullname": "Nom complet", "header-logo-title": "Retourner à la page des tableaux", "hide-system-messages": "Masquer les messages système", diff --git a/package.json b/package.json index ea659347..7e90c7df 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.01.0", + "version": "1.02.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index eeba4409..51eaf382 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 = 86, + appVersion = 87, # Increment this for every release. - appMarketingVersion = (defaultText = "1.01.0~2018-05-23"), + appMarketingVersion = (defaultText = "1.02.0~2018-05-26"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index d9250392..2333f5db 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -83,7 +83,7 @@ parts: plugin: nodejs node-engine: 8.11.1 node-packages: - - npm@6.0.1 + - npm - node-gyp - node-pre-gyp - fibers@2.0.0 @@ -96,6 +96,8 @@ parts: - npm - curl - execstack + stage-packages: + - libfontconfig1 override-build: | echo "Cleaning environment first" rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules @@ -138,13 +140,18 @@ parts: meteor npm install --allow-superuser meteor build .build --directory --allow-superuser cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt - rm -rf node_modules/bcrypt - meteor npm install --save bcrypt + #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. + #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac + #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c + #cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt + #rm -rf node_modules/bcrypt + #meteor npm install --save bcrypt + # Change from npm-bcrypt directory back to .build/bundle/programs/server directory. + #cd ../../../../ # Change to directory .build/bundle/programs/server - cd ../../../../ + cd .build/bundle/programs/server npm install - meteor npm install --save bcrypt + #meteor npm install --save bcrypt # Change back to Wekan source directory cd ../../../.. cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/ @@ -153,6 +160,8 @@ parts: execstack --clear-execstack $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs organize: README: README.wekan + prime: + - -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp helpers: source: snap-src |