butter/keanu-weblite
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
N-Pex 2022-10-29 09:35:41 +02:00
commit b70d0a975c
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/assets/quotes/en/quotes.json
View file

@ -50,7 +50,7 @@
{ {
"quote":"Every child is an artist. The problem is how to remain an artist once he grows up.","author":"Pablo Picasso"}, "quote":"Every child is an artist. The problem is how to remain an artist once he grows up.","author":"Pablo Picasso"},
{ {
"quote":"You can never cross the ocean until you have the courage to lose sight of the shore.","author":"Christopher Columbus"}, "quote":"We will be known forever by the tracks we leave.","author":"Dakota Tribe"},
{ {
"quote":"I’ve learned that people will forget what you said, people will forget what you did, but people will never forget how you made them feel.","author":"Maya Angelou"}, "quote":"I’ve learned that people will forget what you said, people will forget what you did, but people will never forget how you made them feel.","author":"Maya Angelou"},
{ {

2
src/components/messages/messageMixin.js
View file

@ -82,7 +82,7 @@ export default {
while (lines.length && !lines[0].startsWith('> ')) lines.shift(); while (lines.length && !lines[0].startsWith('> ')) lines.shift();
// Reply fallback has a blank line after it, so remove it to prevent leading newline // Reply fallback has a blank line after it, so remove it to prevent leading newline
if (lines[0] === '') lines.shift(); if (lines[0] === '') lines.shift();
const text = lines[0].replace(/^> (<.*> )?/g, ''); const text = lines[0] && lines[0].replace(/^> (<.*> )?/g, '');
if (text) { if (text) {
return text; return text;
} }

2
vue.config.js
View file

@ -19,7 +19,7 @@ module.exports = {
resolve: { resolve: {
fallback: { fallback: {
"path": require.resolve("path-browserify"), "path": require.resolve("path-browserify"),
"crypto": false, //require.resolve("crypto-browserify"), "crypto": require.resolve("crypto-browserify"),
"stream": require.resolve("stream-browserify"), "stream": require.resolve("stream-browserify"),
"fs": require.resolve("browserify-fs"), "fs": require.resolve("browserify-fs"),
"buffer": require.resolve("buffer") "buffer": require.resolve("buffer")