Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76fcd79203 | ||
|
|
3ce1bc0419 | ||
|
|
540fbfceb5 | ||
|
|
48a56648e2 | ||
|
|
6d002c311c |
+2
-6
@@ -16,13 +16,9 @@ WORKDIR /app
|
||||
|
||||
COPY server/.npmrc server/package.json server/package-lock.json ./
|
||||
|
||||
RUN apk add \
|
||||
g++ make python3 \
|
||||
--virtual node-pre-gyp-dependencies \
|
||||
--no-cache \
|
||||
&& npm install npm@latest --global \
|
||||
RUN npm install npm@latest --global \
|
||||
&& npm install --production \
|
||||
&& apk del node-pre-gyp-dependencies --purge
|
||||
&& apk del vips-dependencies --purge
|
||||
|
||||
COPY docker-start.sh start.sh
|
||||
COPY server .
|
||||
|
||||
+1
-2
@@ -24,5 +24,4 @@ RUN apk -U upgrade \
|
||||
&& ./configure \
|
||||
&& make \
|
||||
&& make install-strip \
|
||||
&& rm -rf /tmp/vips-${VIPS_VERSION} \
|
||||
&& apk del vips-dependencies --purge
|
||||
&& rm -rf /tmp/vips-${VIPS_VERSION}
|
||||
|
||||
Generated
+25
@@ -34,6 +34,7 @@
|
||||
"redux-logger": "^3.0.6",
|
||||
"redux-orm": "^0.16.2",
|
||||
"redux-saga": "^1.1.3",
|
||||
"remark-breaks": "^3.0.2",
|
||||
"remark-gfm": "^3.0.1",
|
||||
"reselect": "^4.1.5",
|
||||
"sails.io.js": "^1.2.1",
|
||||
@@ -18824,6 +18825,20 @@
|
||||
"node": ">= 0.10"
|
||||
}
|
||||
},
|
||||
"node_modules/remark-breaks": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-3.0.2.tgz",
|
||||
"integrity": "sha512-x96YDJ9X+Ry0/JNZFKfr1hpcAKvGYWfUTszxY9RbxKEqq6uzPPoLCuHdZsLPZZUdAv3nCROyc7FPrQLWr2rxyw==",
|
||||
"dependencies": {
|
||||
"@types/mdast": "^3.0.0",
|
||||
"unified": "^10.0.0",
|
||||
"unist-util-visit": "^4.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/unified"
|
||||
}
|
||||
},
|
||||
"node_modules/remark-gfm": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
|
||||
@@ -36761,6 +36776,16 @@
|
||||
"resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
|
||||
"integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
|
||||
},
|
||||
"remark-breaks": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-3.0.2.tgz",
|
||||
"integrity": "sha512-x96YDJ9X+Ry0/JNZFKfr1hpcAKvGYWfUTszxY9RbxKEqq6uzPPoLCuHdZsLPZZUdAv3nCROyc7FPrQLWr2rxyw==",
|
||||
"requires": {
|
||||
"@types/mdast": "^3.0.0",
|
||||
"unified": "^10.0.0",
|
||||
"unist-util-visit": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"remark-gfm": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-3.0.1.tgz",
|
||||
|
||||
@@ -91,6 +91,7 @@
|
||||
"redux-logger": "^3.0.6",
|
||||
"redux-orm": "^0.16.2",
|
||||
"redux-saga": "^1.1.3",
|
||||
"remark-breaks": "^3.0.2",
|
||||
"remark-gfm": "^3.0.1",
|
||||
"reselect": "^4.1.5",
|
||||
"sails.io.js": "^1.2.1",
|
||||
|
||||
@@ -2,6 +2,7 @@ import React, { useCallback } from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import ReactMarkdown from 'react-markdown';
|
||||
import remarkGfm from 'remark-gfm';
|
||||
import remarkBreaks from 'remark-breaks';
|
||||
|
||||
import './Markdown.module.scss'; // FIXME: import as styles?
|
||||
|
||||
@@ -35,7 +36,7 @@ const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
|
||||
<ReactMarkdown
|
||||
{...props}
|
||||
components={components}
|
||||
remarkPlugins={[remarkGfm]}
|
||||
remarkPlugins={[remarkGfm, remarkBreaks]}
|
||||
className="markdown-body"
|
||||
/>
|
||||
/* eslint-enable react/jsx-props-no-spreading */
|
||||
|
||||
@@ -11,7 +11,7 @@ import frLogin from './fr/login';
|
||||
import jaLogin from './ja/login';
|
||||
import plLogin from './pl/login';
|
||||
import ruLogin from './ru/login';
|
||||
import seLogin from './se/login';
|
||||
import svLogin from './sv/login';
|
||||
import uzLogin from './uz/login';
|
||||
import zhLogin from './zh/login';
|
||||
|
||||
@@ -25,7 +25,7 @@ const localePairs = [
|
||||
['ja', jaLogin],
|
||||
['pl', plLogin],
|
||||
['ru', ruLogin],
|
||||
['se', seLogin],
|
||||
['sv', svLogin],
|
||||
['uz', uzLogin],
|
||||
['zh', zhLogin],
|
||||
];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import dateFns from 'date-fns/locale/se';
|
||||
import dateFns from 'date-fns/locale/sv';
|
||||
|
||||
export default {
|
||||
dateFns,
|
||||
@@ -24,10 +24,12 @@ export default {
|
||||
all: 'Alla',
|
||||
allChangesWillBeAutomaticallySavedAfterConnectionRestored:
|
||||
'Alla ändringar kommer att sparas automatiskt<br />så fort anslutningen är återställd',
|
||||
areYouSureYouWantToDeleteThisAttachment: 'Är du säker på att du vill ta bort den här bilagan?',
|
||||
areYouSureYouWantToDeleteThisAttachment:
|
||||
'Är du säker på att du vill ta bort den här bilagan?',
|
||||
areYouSureYouWantToDeleteThisBoard: 'Är du säker på att du vill ta bort den här tavlan?',
|
||||
areYouSureYouWantToDeleteThisCard: 'Är du säker på att du vill ta bort det här kortet?',
|
||||
areYouSureYouWantToDeleteThisComment: 'Är du säker på att du vill ta bort den här kommentaren?',
|
||||
areYouSureYouWantToDeleteThisComment:
|
||||
'Är du säker på att du vill ta bort den här kommentaren?',
|
||||
areYouSureYouWantToDeleteThisLabel: 'Är du säker på att du vill ta bort den här etiketten?',
|
||||
areYouSureYouWantToDeleteThisList: 'Är du säker på att du vill ta bort den här listan?',
|
||||
areYouSureYouWantToDeleteThisProject: 'Är du säker på att du vill ta bort det här projektet?',
|
||||
@@ -136,7 +138,8 @@ export default {
|
||||
userActions_title: 'Användaråtgärder',
|
||||
userAddedThisCardToList: '<0>{{user}}</0><1> lade till detta kort i {{list}}</1>',
|
||||
userLeftNewCommentToCard: '{{user}} lämnade en ny kommentar «{{comment}}» på <2>{{card}}</2>',
|
||||
userMovedCardFromListToList: '{{user}} flyttade <2>{{card}}</2> från {{fromList}} till {{toList}}',
|
||||
userMovedCardFromListToList:
|
||||
'{{user}} flyttade <2>{{card}}</2> från {{fromList}} till {{toList}}',
|
||||
userMovedThisCardFromListToList:
|
||||
'<0>{{user}}</0><1> flyttade detta kort från {{fromList}} till {{toList}}</1>',
|
||||
username: 'Användarnamn',
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "planka",
|
||||
"version": "0.1.0",
|
||||
"version": "1.1.5",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "planka",
|
||||
"version": "0.1.0",
|
||||
"version": "1.1.5",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "planka",
|
||||
"version": "1.1.3",
|
||||
"version": "1.1.5",
|
||||
"private": true,
|
||||
"homepage": "https://plankanban.github.io/planka",
|
||||
"repository": {
|
||||
|
||||
Reference in New Issue
Block a user