diff --git a/.gitignore b/.gitignore
index 9dc44a475..9ed58a696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
.DS_Store
node_modules/
dist/
-src/public/dist/
+src/public/app-dist/
npm-debug.log
yarn-error.log
*.db
diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index 2030a99be..d83f9f47f 100755
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -29,7 +29,7 @@ cp webpack-* $DIR/
find $DIR/libraries -name "*.map" -type f -delete
-rm -r $DIR/src/public/javascripts
+rm -r $DIR/src/public/app
-sed -i -e 's/javascripts\/desktop.js/dist\/desktop.js/g' $DIR/src/views/desktop.ejs
-sed -i -e 's/javascripts\/mobile.js/dist\/mobile.js/g' $DIR/src/views/mobile.ejs
\ No newline at end of file
+sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
+sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 8622585ea..ce8f98684 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "trilium",
- "version": "0.41.1-beta",
+ "version": "0.41.2-beta",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -178,23 +178,23 @@
}
},
"@jimp/bmp": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.10.1.tgz",
- "integrity": "sha512-gy4ftMCgBZOx1e/Q+MaJlmU4qgqVqwGdf7G6byYTLEMUzzGK2Ipxf3nlXfkMOZqw7Bhc17zDnBIKluo7k0kX5Q==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.10.2.tgz",
+ "integrity": "sha512-vsLwkfj6rcxtSxEdpQaxDagrgpOB0ErHTS/vVRQKDIhrzZkW1ddQa9W1hV8qssSY3K7lz1QNYFQdeRw/qoCiBA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"bmp-js": "^0.1.0",
"core-js": "^3.4.1"
}
},
"@jimp/core": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.10.1.tgz",
- "integrity": "sha512-ChyLkGb1+x2mRpsdcnQuRNb523qVqUc7+zCbuO/VAMaqvbMKuRalVz3aHXcVwNi8vOAOgce4LOBT7kjdKTtR/w==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.10.2.tgz",
+ "integrity": "sha512-oyJLzWYcT6u0joD2YJAAVqCc1Ng9wXGPdAijWy3xxQT/roALmWLGL5ev6fQ/gugPVAD+xKUQpM0OxJepRYUl0Q==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"any-base": "^1.1.0",
"buffer": "^5.2.0",
"core-js": "^3.4.1",
@@ -215,295 +215,295 @@
}
},
"@jimp/custom": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.10.1.tgz",
- "integrity": "sha512-hiiOL5sGcV1p8hCFTabALUOmXs4VP9VwhfBZtsFueKGbwWz6dmaZvkMBsk3Mz1ukBP3xb09goWG+zAIdTm88fw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.10.2.tgz",
+ "integrity": "sha512-+ErCKYrIC0m6nDxRwIq0ETdltL4+C8RKrv3bGW/bI94QSfIXCdP6Vsz03VMae1J9+IPjfhn1LJ5rQ3zWkZEfdA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/core": "^0.10.1",
+ "@jimp/core": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/gif": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.10.1.tgz",
- "integrity": "sha512-xJwZ6JI6+GmrgTw///YdV8GY1z2dp4AAxEdm/KPozTvS2rygC8OZJcTmlswFws0UCH43rKzJlQUXa4Jb3ybB6w==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.10.2.tgz",
+ "integrity": "sha512-Evkwr7Vlt5zMqNccsUDetHpKtvhFz07yg8BRZl3kXzkeKeaK/PbuAV7yjXn1DxVVU+1uSS765MdbsMVe7J404A==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1",
"omggif": "^1.0.9"
}
},
"@jimp/jpeg": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.10.1.tgz",
- "integrity": "sha512-PXxrBWZNNGpm7PRpdi2jt9fpTpQwe2Gf4juwuHXP/dBFHLk3wiI/npKkVITplwzzoQ6D4N0cb279c9bOpuQeJQ==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.10.2.tgz",
+ "integrity": "sha512-+aQUGBZI6OueB0K6gqLCwehV5skZceVyZjjmPmuXaE7ZvdhFMP2QDh45vcT8LzlPGUcOwpIWxsGHrB6Q6RcFXQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1",
"jpeg-js": "^0.3.4"
}
},
"@jimp/plugin-blit": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.10.1.tgz",
- "integrity": "sha512-53647EfRvPQJKQCMBc5AJGSZHyl6eueaOQq7PrfxEEq9Q3IjVcikAWYrZ4bHSZY7J12IIuz/5bSLJJZfegNQtA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.10.2.tgz",
+ "integrity": "sha512-PdqKZLkwnOOnrr+M4X4K/GrQ26qeCHut7AoFbKW+BsHooHvyadOWwVTBUBfK8GyDp/NApEC9SXbT0UNk8XqabA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-blur": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.10.1.tgz",
- "integrity": "sha512-0PzdzPGuv8RlhiMbLcM0tIekkHhuaPTY+frEWmO8BuCeqW9Tg9W4RxdwZtMqIVRG+kZBgyltYee31Q4JWlu9Hg==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.10.2.tgz",
+ "integrity": "sha512-9KeLyUY3s5N0cPZN4uMg0qIiSDvIPhXEnpYnXdN2V53dM25sKrBCMH578/W+n9hAHVpsbJHS+VFknO1JV47QVw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-circle": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.10.1.tgz",
- "integrity": "sha512-sqiiEddN81N9xHZbPVjaJlbpQabaCeNGLW/x+0BfuNxnMPq7OkOx8IRpqIDYiGuuPhiR5hWxmmpws8ZAhjwsVw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.10.2.tgz",
+ "integrity": "sha512-wOJ3qKa916YZMEwA9qwIn8yROYonkscJ3bqaaSsyf5CadiY8VCijKxA3BVwr7PKjj89yf5RCS4mcy+CO8+nmkw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-color": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.10.1.tgz",
- "integrity": "sha512-SmW2+hFtNmQ33WYVsgKvreS8peCc5qItAvqGR58lKNoIMEZSNpyGwIu9g83HtDIImGsXpz3DWGMR1h8sLYCFcQ==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.10.2.tgz",
+ "integrity": "sha512-c6cw41Hn3tLYQIRg3hxXrefKcOfW4jRN9b9DGH16mcZrRtw5jMzq3NfZ+RLQM47SyAE7N2BeUz0Ah3pmCArI0g==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1",
"tinycolor2": "^1.4.1"
}
},
"@jimp/plugin-contain": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.10.1.tgz",
- "integrity": "sha512-1PkmUPd5iAicAI7QjO9r1Mp/Ia7ElJPwXTCNLsQkDxYS/L4u7vQ0xCkQkokAeR49Ul3GTWLqj9paWr7VSBG9Fg==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.10.2.tgz",
+ "integrity": "sha512-oDDe+XdpSwx2OQOSb6ar4O31+4d02Qz4R+1BeucuO7FzOrbDggnCWavSg6RevyOJPDKGkmv8Jj3V6S0jUwgVgw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-cover": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.10.1.tgz",
- "integrity": "sha512-fCiz+ugrRwffNixUHFxtRKhTYm8sFAoYbNNzV0WdiG8dS0qhoYjbOJPtLcIw9CyJbMZ5eXjGOTxhTAGzBng9DA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.10.2.tgz",
+ "integrity": "sha512-cnEqx8kHqBvQA+axKA8qRshwAIIfyxAwjdeRB/LZ9bWroh8XvbifW5buBgITDG5KklDkBhivmDEtPY90r3mMFQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-crop": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.10.1.tgz",
- "integrity": "sha512-KjW+RuuNcsIvvNF1ejbBjcDNus/fLz69LGAU2gwhFzw7A0iOUEJJgTWzkGBLZ/YvUaWMDtPnznF3X3oYHeOj6A==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.10.2.tgz",
+ "integrity": "sha512-6uTb3LMP0kiMqYOAHyU/q/pkScw6aRWkTSxhjgcsewQS3zPHWTSGgP8u6CNAFnlDmVYVIz/jdKlFnnOdf0ZwrA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-displace": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.10.1.tgz",
- "integrity": "sha512-NUJcjMRb6iR9rwJSC7t8LMJgRs5Z0mzflYBymvttkjlcIoB4RPIOu3gWn5iT5IepB50YTy9zJuCaofMYn4DnaA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.10.2.tgz",
+ "integrity": "sha512-AGQDlyeFJz+zszYUkIzi5QyLLPsJzRJNIplU0S0HBxmXf5tZEeiiEtmsaC4j9VoAVD9Jwwn39+cfwV88Ij7WGg==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-dither": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.10.1.tgz",
- "integrity": "sha512-V/PCL44R16w5EDCgMvFXBaWFQ0f3LLDD3CQxJFOw6awswkP60m13nUUtWHm7QB54Gghhgk8JEOD/mZo6JsnaBg==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.10.2.tgz",
+ "integrity": "sha512-TEu7n44OS/+F1eWqKumsKYI+i2cPxzRTmxJhxrsUGyDD2aNi7tCIfKILXDqO6Ii0tYgSqwakG2+Eu0Jqg7J/VQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-fisheye": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.1.tgz",
- "integrity": "sha512-GgIAY6ryL+2RwRb6j+APo972f8VjftolnvjVM1ilxO4pdfJf7gdg3Bp4igka9fgW94BBgdJlCPUeWIVap3AYaA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.2.tgz",
+ "integrity": "sha512-kxtfkcnnXitqpTxGaZg/q6bzMBRWCFEWs7maMIgjFkGvXsMegQ90EdKF1Ku76/gCTIGxyfbped8QD/+iACgzFw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-flip": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.10.1.tgz",
- "integrity": "sha512-CkSwULwmVYOo6ZY/QnR0/mrfMaf/3g+sDo7osAHaf0GvuoIw76NSh6LwaANAsLZ9erknZ67XuqCjZWoMwNrbaw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.10.2.tgz",
+ "integrity": "sha512-JW/aAKPGYOEGrqldpUBFxHUZ21pwhtxeRiwXEyMu/8N23PVuNBAePKboPMxRvkSLvAOn122xKEyCQvF10v/TOQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-gaussian": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.1.tgz",
- "integrity": "sha512-RnmIWUr9RB1RrgqXG2H7C3dyncak/D2CPoP2DehAgxxHprDdxm9HoFjhGQ9eh+Ygr0nXE7t2+fDE12U3VW3ApA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.2.tgz",
+ "integrity": "sha512-uP1up3fCIBzGexqs/+HMGBoZckEEcic09RNRj5Lq6EUVY8vFdKeBk3F+tAA+fstpA6yHhjPk1w7FZKX/tkECNw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-invert": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.10.1.tgz",
- "integrity": "sha512-PpTUbnjsAkw0nZnbZWrKdsEW46MARhzzabBXy/XCjvutG3jzoO8EL19VeEtcrxBml9duJbaOzdzYmbFkQsNINQ==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.10.2.tgz",
+ "integrity": "sha512-zm1NB+AS0fTKW0gmFs1Tjgkj892gtnDicyxzmYeCLoQzPTr/1iPVf2EGidCS88+aw04sA5DOu0UX7637ib7TkA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-mask": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.10.1.tgz",
- "integrity": "sha512-Fm75MSucSGI19n9beXGVPSR98flXpzJLyOfSj0+zefXafrO+kmYO9eWtzNd3TE6jzyGe5y7mPJPHB0PWXKgw4g==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.10.2.tgz",
+ "integrity": "sha512-4pVBAU6d/7EhfYs8sYuBGB3JMIuvrdiXbt6ESNs4CyDSbiDT4z1/f2sjWvNyLYlJ7cQJ+we50qqvq8vvNnb5lA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-normalize": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.10.1.tgz",
- "integrity": "sha512-mxjRCmUB/yD973pgjAKb3HCYMyh1GvGtdo71+pJn+ChefvTJ0LDB1FknwTVjDtJuy4mBh0TkBqBp4PNAtdBL6w==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.10.2.tgz",
+ "integrity": "sha512-B2HXf6uaH8EAyZA5KvVYJOfv4AZpferIuDhOQSqDLKAEBBfEViwHk/Rn+nCUzGsAzQ/yiVtKAil68YcybaI6oQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-print": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.10.1.tgz",
- "integrity": "sha512-eSPTbdES/ISR9nMHV8e449UMs0Dx0eY9OixU7gIYTDnTmnhyYXq9bqIY/IXqVU3fOj330MIpIpi6pavmtJXdLA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.10.2.tgz",
+ "integrity": "sha512-YXKBG5yNOr/DX958Omk1GzTrprRJ3YXWhJ6tzCbboxqXK6pErLDxFsa1mlngDGb/a43oGs63Myj7CuGf98/vaw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1",
"load-bmfont": "^1.4.0"
}
},
"@jimp/plugin-resize": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.10.1.tgz",
- "integrity": "sha512-aG42+tRmhAYKvybZteSD7s48dAcYSkipyM+e2aizRa0D0FHNIQlIHribiKfRTiX+ewx/fhHVu0vpFKOg0N2hDw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.10.2.tgz",
+ "integrity": "sha512-F+pXSU5sbACqqArZfVeYYXrq7qMwZcMs97Z3V70qsLtvDSVyNFG5iYpJhFKJOj05O7a2G7FQ1Nq2h0UKJdlLJg==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-rotate": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.10.1.tgz",
- "integrity": "sha512-R+Qpb3cwKl6L5m9RUkJatY5D5JuPg/uUfFbdFPaBhc5infC46Rsyt0j923eUyXkisechRDmzoTbG3fcc1MjzSA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.10.2.tgz",
+ "integrity": "sha512-bQ0RQuXS768G9l1HemULJ7puuevU5N3TpE1QV5NdzbKwjHidFAAavp8XFXOhd2Mj/Xh/3iFlMMEB7NG/McYoOA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-scale": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.10.1.tgz",
- "integrity": "sha512-MKmW3Rr0sSApglUYFqJ8LgGy9Nm9w2oRgSB2twxA5bp1waM9fdOILcRyEnltwHIIDSoyR0me8XmpuwpyqaqSdA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.10.2.tgz",
+ "integrity": "sha512-47GRG3joOGDBLHYyLR0tc3hEz/H8tgPcLZaNEAaIdyL+ckAWQIgnoytbqj7OEAFeMj5j+loNm+ahJVX7w/X/ug==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-shadow": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.10.1.tgz",
- "integrity": "sha512-H4JSVimD19vbFiX8SL3Ci5Htsbb3xG8zQrkjf+ui/2MXbeP0FyWlIv3g1Ahil4oE+5Wi4zbq20Dyba2GS4aINw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.10.2.tgz",
+ "integrity": "sha512-koksEMJZKjq8OiprLh+ffrRo/x/dXHCsfaKS4kf2EoFZEb6sZHeJgKLwozLky1DXBPiMryYSrNt8Cb6wzjd1zA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugin-threshold": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.10.1.tgz",
- "integrity": "sha512-o2nBEz2tLvfYNMdac9qho5SrjFoBfbJow8PWXMWz14N6zLKIw4DQT+inSbEKxbxlqKseds3zUsOIM+0hLbSDeQ==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.10.2.tgz",
+ "integrity": "sha512-RQzxB40KK50iUUNLF9M7G3dVKFmbe/T4EQVWMPxxX8NQPNbU0vjZzTW0vVYoTYno2vLxewQgV0Y3ydX/l08NLg==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1"
}
},
"@jimp/plugins": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.10.1.tgz",
- "integrity": "sha512-gpdoh7XITd33ZClObVKYV8ASpZnrwebNuY4C5njeJfLxfyRQ2wSK9TDAb/5OYcyrbMDIqBaKLg9AXHPBphwXtg==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.10.2.tgz",
+ "integrity": "sha512-z4Fhu97WZIussTzd1PJXUUuluushXlfCYzXifixf8fGAoVGZuMMJl6aqtuy4eUOgLyN8sXun0MzdWAahelqbfA==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/plugin-blit": "^0.10.1",
- "@jimp/plugin-blur": "^0.10.1",
- "@jimp/plugin-circle": "^0.10.1",
- "@jimp/plugin-color": "^0.10.1",
- "@jimp/plugin-contain": "^0.10.1",
- "@jimp/plugin-cover": "^0.10.1",
- "@jimp/plugin-crop": "^0.10.1",
- "@jimp/plugin-displace": "^0.10.1",
- "@jimp/plugin-dither": "^0.10.1",
- "@jimp/plugin-fisheye": "^0.10.1",
- "@jimp/plugin-flip": "^0.10.1",
- "@jimp/plugin-gaussian": "^0.10.1",
- "@jimp/plugin-invert": "^0.10.1",
- "@jimp/plugin-mask": "^0.10.1",
- "@jimp/plugin-normalize": "^0.10.1",
- "@jimp/plugin-print": "^0.10.1",
- "@jimp/plugin-resize": "^0.10.1",
- "@jimp/plugin-rotate": "^0.10.1",
- "@jimp/plugin-scale": "^0.10.1",
- "@jimp/plugin-shadow": "^0.10.1",
- "@jimp/plugin-threshold": "^0.10.1",
+ "@jimp/plugin-blit": "^0.10.2",
+ "@jimp/plugin-blur": "^0.10.2",
+ "@jimp/plugin-circle": "^0.10.2",
+ "@jimp/plugin-color": "^0.10.2",
+ "@jimp/plugin-contain": "^0.10.2",
+ "@jimp/plugin-cover": "^0.10.2",
+ "@jimp/plugin-crop": "^0.10.2",
+ "@jimp/plugin-displace": "^0.10.2",
+ "@jimp/plugin-dither": "^0.10.2",
+ "@jimp/plugin-fisheye": "^0.10.2",
+ "@jimp/plugin-flip": "^0.10.2",
+ "@jimp/plugin-gaussian": "^0.10.2",
+ "@jimp/plugin-invert": "^0.10.2",
+ "@jimp/plugin-mask": "^0.10.2",
+ "@jimp/plugin-normalize": "^0.10.2",
+ "@jimp/plugin-print": "^0.10.2",
+ "@jimp/plugin-resize": "^0.10.2",
+ "@jimp/plugin-rotate": "^0.10.2",
+ "@jimp/plugin-scale": "^0.10.2",
+ "@jimp/plugin-shadow": "^0.10.2",
+ "@jimp/plugin-threshold": "^0.10.2",
"core-js": "^3.4.1",
"timm": "^1.6.1"
}
},
"@jimp/png": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.10.1.tgz",
- "integrity": "sha512-/2CUaOjbq5GVaXKRGzM4nhhFpnVdWNazsuVZ3Et8sgMxJxep7v6k2hmvL8rr0/A4UPPWzEbFsagz/YBbN9fANw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.10.2.tgz",
+ "integrity": "sha512-3r5q9Ns3Gz8pcI8oBdGTY7d0TkkW4atZ12bknB1sABc3UYX69arqmTvrULMYhWf0M6n3tKHdnmdW2cTlFWIAbw==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/utils": "^0.10.1",
+ "@jimp/utils": "^0.10.2",
"core-js": "^3.4.1",
"pngjs": "^3.3.3"
}
},
"@jimp/tiff": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.10.1.tgz",
- "integrity": "sha512-lvCzid4RwCZr/Zz3W4xTD/UKe4xjVdPk2dGGozrW0Puo2TCz5L+ghXYEWxzoj/rm/wOFmQbaYdopv0UQ72HqWw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.10.2.tgz",
+ "integrity": "sha512-uuJF6ZMXo0EDyooho9RhwAY9YGcgUju1mw53N9BtU7E9Y+AxKn7miaK2niROmN2/ufmLJO8vS9zjpgAxv+zgKQ==",
"requires": {
"@babel/runtime": "^7.7.2",
"core-js": "^3.4.1",
@@ -511,24 +511,24 @@
}
},
"@jimp/types": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.10.1.tgz",
- "integrity": "sha512-PaPhpeHE41Yn6myvnHmrb1FNvn+XmF+EpizhP8JR3DmyveUPblrssM8qA5iMe+Q+wG3vJ02LHNgbfFCUYJr3zA==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.10.2.tgz",
+ "integrity": "sha512-XCgFhH8BR0ovxrEkDnKRXalEAUjo3vW9vwOFxfSrJR/YS/k0TsvYB6/+QAU/cGwcN8icmYdDyhq2yhJACAl13w==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/bmp": "^0.10.1",
- "@jimp/gif": "^0.10.1",
- "@jimp/jpeg": "^0.10.1",
- "@jimp/png": "^0.10.1",
- "@jimp/tiff": "^0.10.1",
+ "@jimp/bmp": "^0.10.2",
+ "@jimp/gif": "^0.10.2",
+ "@jimp/jpeg": "^0.10.2",
+ "@jimp/png": "^0.10.2",
+ "@jimp/tiff": "^0.10.2",
"core-js": "^3.4.1",
"timm": "^1.6.1"
}
},
"@jimp/utils": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.10.1.tgz",
- "integrity": "sha512-Q0ZT2FGPQo3lXkUheAsg0dVWo0Ko+vYCVJLEUxQMxmPiDLUquE22iya+tMONPOaRj1GG3cznaSqaEHDNgoyYbw==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.10.2.tgz",
+ "integrity": "sha512-B3fBgkE7t7S4X1RXKY5vfx+8QdUvN0AIbG2rM7csYTsudOczTtzimlP7XxunYtOwCYBLVswRWpqn8PZcRLWu2w==",
"requires": {
"@babel/runtime": "^7.7.2",
"core-js": "^3.4.1",
@@ -3352,9 +3352,9 @@
"integrity": "sha512-IncmUpn1yN84hy2shb0POJ80FWrfGNY0cxO9f4v+/sG7qcBvAtVWUA1IdzY/8EYUmOVhoKJVdJjNd3AZcnxOjA=="
},
"electron": {
- "version": "9.0.0-beta.15",
- "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.15.tgz",
- "integrity": "sha512-trC0uHL11l5GWmMY8MZpj3QcyQnQWANiauLkeOvYv/QTbj5K0H3bRXmG3QhZcVNdNAG5tEd1hDMhQHe5oRrn9A==",
+ "version": "9.0.0-beta.16",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.16.tgz",
+ "integrity": "sha512-Ky+rH7JwioIRDv4JTOt7B76gTgOrNq0Y3PyDPR6AaDabTYaIG5dNAY8hLRNHVkWkuMPToKLz1F1gJfFohqxtvQ==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@@ -6221,14 +6221,14 @@
}
},
"jimp": {
- "version": "0.10.1",
- "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.10.1.tgz",
- "integrity": "sha512-dRs9hdUXseS7y214GxZxeLiXNQZUXnjdzv9I5+FVWAnyK0bdIGgjUn5WLuNF4uAKkzIH3cFA24EbviOlBIpRDg==",
+ "version": "0.10.2",
+ "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.10.2.tgz",
+ "integrity": "sha512-dt6n3P0LZyoqAiIUur+gJEKS55sCUUo19cKx8LTSZRqGizF4JN0jfRAnfnV4nxF+sINP2FN6SOi82gHcAMm1nQ==",
"requires": {
"@babel/runtime": "^7.7.2",
- "@jimp/custom": "^0.10.1",
- "@jimp/plugins": "^0.10.1",
- "@jimp/types": "^0.10.1",
+ "@jimp/custom": "^0.10.2",
+ "@jimp/plugins": "^0.10.2",
+ "@jimp/types": "^0.10.2",
"core-js": "^3.4.1",
"regenerator-runtime": "^0.13.3"
}
@@ -9981,9 +9981,9 @@
}
},
"semver": {
- "version": "7.2.2",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.2.tgz",
- "integrity": "sha512-Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA=="
+ "version": "7.3.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+ "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
},
"semver-compare": {
"version": "1.0.0",
@@ -10317,9 +10317,9 @@
"dev": true
},
"sqlite": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/sqlite/-/sqlite-4.0.6.tgz",
- "integrity": "sha512-irh1vzqke8XzO+BZQnFAX9doIsILFxpjDPWSX005thjxqx+GXApAMarNkM6Ta7S/yT6KMJ9bniwiD0bRcQuuFQ=="
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/sqlite/-/sqlite-4.0.7.tgz",
+ "integrity": "sha512-1bBO+me3gXRfqwRR3K9aNDoSbTkQ87o6fSjj/BE2gSHHsK3qIDR+LoFZHgZ6kSPdFBoLTsy5/w/+8PBBaK+lvg=="
},
"sqlite3": {
"version": "4.1.1",
diff --git a/package.json b/package.json
index 653d1b37d..48be32a5a 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
"start-server": "TRILIUM_ENV=dev node ./src/www",
"start-electron": "TRILIUM_ENV=dev electron .",
"build-backend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/entities/*.js src/services/backend_script_api.js",
- "build-frontend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/javascripts/entities/*.js src/public/javascripts/services/frontend_script_api.js",
+ "build-frontend-docs": "./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js",
"build-docs": "npm run build-backend-docs && npm run build-frontend-docs",
- "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js"
+ "webpack": "npx webpack -c webpack-desktop.config.js && npx webpack -c webpack-mobile.config.js && npx webpack -c webpack-setup.config.js"
},
"dependencies": {
"async-mutex": "0.2.1",
@@ -51,7 +51,7 @@
"imagemin-pngquant": "8.0.0",
"ini": "1.3.5",
"is-svg": "4.2.1",
- "jimp": "0.10.1",
+ "jimp": "0.10.2",
"mime-types": "2.1.26",
"multer": "1.4.2",
"node-abi": "2.15.0",
@@ -62,11 +62,11 @@
"rimraf": "3.0.2",
"sanitize-filename": "1.6.3",
"sax": "1.2.4",
- "semver": "7.2.2",
+ "semver": "7.3.2",
"serve-favicon": "2.5.0",
"session-file-store": "1.4.0",
"simple-node-logger": "18.12.24",
- "sqlite": "4.0.6",
+ "sqlite": "4.0.7",
"sqlite3": "4.1.1",
"string-similarity": "4.0.1",
"tar-stream": "2.1.2",
@@ -78,7 +78,7 @@
"yazl": "^2.5.1"
},
"devDependencies": {
- "electron": "9.0.0-beta.15",
+ "electron": "9.0.0-beta.16",
"electron-builder": "22.4.1",
"electron-packager": "14.2.1",
"electron-rebuild": "1.10.1",
diff --git a/src/app.js b/src/app.js
index bff02a8b6..3ef1a7c0f 100644
--- a/src/app.js
+++ b/src/app.js
@@ -45,7 +45,6 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
app.use('/libraries', express.static(path.join(__dirname, '..', 'libraries')));
app.use('/images', express.static(path.join(__dirname, '..', 'images')));
-app.use('/dist', express.static(path.join(__dirname, '..', 'dist')));
const sessionParser = session({
secret: sessionSecret,
resave: false, // true forces the session to be saved back to the session store, even if the session was never modified during the request.
diff --git a/src/public/javascripts/desktop.js b/src/public/app/desktop.js
similarity index 100%
rename from src/public/javascripts/desktop.js
rename to src/public/app/desktop.js
diff --git a/src/public/javascripts/dialogs/about.js b/src/public/app/dialogs/about.js
similarity index 100%
rename from src/public/javascripts/dialogs/about.js
rename to src/public/app/dialogs/about.js
diff --git a/src/public/javascripts/dialogs/add_link.js b/src/public/app/dialogs/add_link.js
similarity index 100%
rename from src/public/javascripts/dialogs/add_link.js
rename to src/public/app/dialogs/add_link.js
diff --git a/src/public/javascripts/dialogs/attributes.js b/src/public/app/dialogs/attributes.js
similarity index 100%
rename from src/public/javascripts/dialogs/attributes.js
rename to src/public/app/dialogs/attributes.js
diff --git a/src/public/javascripts/dialogs/backend_log.js b/src/public/app/dialogs/backend_log.js
similarity index 100%
rename from src/public/javascripts/dialogs/backend_log.js
rename to src/public/app/dialogs/backend_log.js
diff --git a/src/public/javascripts/dialogs/branch_prefix.js b/src/public/app/dialogs/branch_prefix.js
similarity index 100%
rename from src/public/javascripts/dialogs/branch_prefix.js
rename to src/public/app/dialogs/branch_prefix.js
diff --git a/src/public/javascripts/dialogs/clone_to.js b/src/public/app/dialogs/clone_to.js
similarity index 100%
rename from src/public/javascripts/dialogs/clone_to.js
rename to src/public/app/dialogs/clone_to.js
diff --git a/src/public/javascripts/dialogs/confirm.js b/src/public/app/dialogs/confirm.js
similarity index 100%
rename from src/public/javascripts/dialogs/confirm.js
rename to src/public/app/dialogs/confirm.js
diff --git a/src/public/javascripts/dialogs/export.js b/src/public/app/dialogs/export.js
similarity index 100%
rename from src/public/javascripts/dialogs/export.js
rename to src/public/app/dialogs/export.js
diff --git a/src/public/javascripts/dialogs/help.js b/src/public/app/dialogs/help.js
similarity index 100%
rename from src/public/javascripts/dialogs/help.js
rename to src/public/app/dialogs/help.js
diff --git a/src/public/javascripts/dialogs/import.js b/src/public/app/dialogs/import.js
similarity index 100%
rename from src/public/javascripts/dialogs/import.js
rename to src/public/app/dialogs/import.js
diff --git a/src/public/javascripts/dialogs/include_note.js b/src/public/app/dialogs/include_note.js
similarity index 100%
rename from src/public/javascripts/dialogs/include_note.js
rename to src/public/app/dialogs/include_note.js
diff --git a/src/public/javascripts/dialogs/info.js b/src/public/app/dialogs/info.js
similarity index 100%
rename from src/public/javascripts/dialogs/info.js
rename to src/public/app/dialogs/info.js
diff --git a/src/public/javascripts/dialogs/jump_to_note.js b/src/public/app/dialogs/jump_to_note.js
similarity index 100%
rename from src/public/javascripts/dialogs/jump_to_note.js
rename to src/public/app/dialogs/jump_to_note.js
diff --git a/src/public/javascripts/dialogs/link_map.js b/src/public/app/dialogs/link_map.js
similarity index 100%
rename from src/public/javascripts/dialogs/link_map.js
rename to src/public/app/dialogs/link_map.js
diff --git a/src/public/javascripts/dialogs/markdown_import.js b/src/public/app/dialogs/markdown_import.js
similarity index 100%
rename from src/public/javascripts/dialogs/markdown_import.js
rename to src/public/app/dialogs/markdown_import.js
diff --git a/src/public/javascripts/dialogs/move_to.js b/src/public/app/dialogs/move_to.js
similarity index 100%
rename from src/public/javascripts/dialogs/move_to.js
rename to src/public/app/dialogs/move_to.js
diff --git a/src/public/javascripts/dialogs/note_info.js b/src/public/app/dialogs/note_info.js
similarity index 100%
rename from src/public/javascripts/dialogs/note_info.js
rename to src/public/app/dialogs/note_info.js
diff --git a/src/public/javascripts/dialogs/note_revisions.js b/src/public/app/dialogs/note_revisions.js
similarity index 100%
rename from src/public/javascripts/dialogs/note_revisions.js
rename to src/public/app/dialogs/note_revisions.js
diff --git a/src/public/javascripts/dialogs/note_source.js b/src/public/app/dialogs/note_source.js
similarity index 100%
rename from src/public/javascripts/dialogs/note_source.js
rename to src/public/app/dialogs/note_source.js
diff --git a/src/public/javascripts/dialogs/options.js b/src/public/app/dialogs/options.js
similarity index 100%
rename from src/public/javascripts/dialogs/options.js
rename to src/public/app/dialogs/options.js
diff --git a/src/public/javascripts/dialogs/options/advanced.js b/src/public/app/dialogs/options/advanced.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/advanced.js
rename to src/public/app/dialogs/options/advanced.js
diff --git a/src/public/javascripts/dialogs/options/appearance.js b/src/public/app/dialogs/options/appearance.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/appearance.js
rename to src/public/app/dialogs/options/appearance.js
diff --git a/src/public/javascripts/dialogs/options/code_notes.js b/src/public/app/dialogs/options/code_notes.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/code_notes.js
rename to src/public/app/dialogs/options/code_notes.js
diff --git a/src/public/javascripts/dialogs/options/credentials.js b/src/public/app/dialogs/options/credentials.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/credentials.js
rename to src/public/app/dialogs/options/credentials.js
diff --git a/src/public/javascripts/dialogs/options/keyboard_shortcuts.js b/src/public/app/dialogs/options/keyboard_shortcuts.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/keyboard_shortcuts.js
rename to src/public/app/dialogs/options/keyboard_shortcuts.js
diff --git a/src/public/javascripts/dialogs/options/other.js b/src/public/app/dialogs/options/other.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/other.js
rename to src/public/app/dialogs/options/other.js
diff --git a/src/public/javascripts/dialogs/options/sync.js b/src/public/app/dialogs/options/sync.js
similarity index 100%
rename from src/public/javascripts/dialogs/options/sync.js
rename to src/public/app/dialogs/options/sync.js
diff --git a/src/public/javascripts/dialogs/prompt.js b/src/public/app/dialogs/prompt.js
similarity index 100%
rename from src/public/javascripts/dialogs/prompt.js
rename to src/public/app/dialogs/prompt.js
diff --git a/src/public/javascripts/dialogs/protected_session.js b/src/public/app/dialogs/protected_session.js
similarity index 100%
rename from src/public/javascripts/dialogs/protected_session.js
rename to src/public/app/dialogs/protected_session.js
diff --git a/src/public/javascripts/dialogs/recent_changes.js b/src/public/app/dialogs/recent_changes.js
similarity index 100%
rename from src/public/javascripts/dialogs/recent_changes.js
rename to src/public/app/dialogs/recent_changes.js
diff --git a/src/public/javascripts/dialogs/sql_console.js b/src/public/app/dialogs/sql_console.js
similarity index 100%
rename from src/public/javascripts/dialogs/sql_console.js
rename to src/public/app/dialogs/sql_console.js
diff --git a/src/public/javascripts/entities/attribute.js b/src/public/app/entities/attribute.js
similarity index 100%
rename from src/public/javascripts/entities/attribute.js
rename to src/public/app/entities/attribute.js
diff --git a/src/public/javascripts/entities/branch.js b/src/public/app/entities/branch.js
similarity index 100%
rename from src/public/javascripts/entities/branch.js
rename to src/public/app/entities/branch.js
diff --git a/src/public/javascripts/entities/note_complement.js b/src/public/app/entities/note_complement.js
similarity index 100%
rename from src/public/javascripts/entities/note_complement.js
rename to src/public/app/entities/note_complement.js
diff --git a/src/public/javascripts/entities/note_short.js b/src/public/app/entities/note_short.js
similarity index 100%
rename from src/public/javascripts/entities/note_short.js
rename to src/public/app/entities/note_short.js
diff --git a/src/public/javascripts/mobile.js b/src/public/app/mobile.js
similarity index 100%
rename from src/public/javascripts/mobile.js
rename to src/public/app/mobile.js
diff --git a/src/public/javascripts/services/app_context.js b/src/public/app/services/app_context.js
similarity index 100%
rename from src/public/javascripts/services/app_context.js
rename to src/public/app/services/app_context.js
diff --git a/src/public/javascripts/services/attribute_autocomplete.js b/src/public/app/services/attribute_autocomplete.js
similarity index 100%
rename from src/public/javascripts/services/attribute_autocomplete.js
rename to src/public/app/services/attribute_autocomplete.js
diff --git a/src/public/javascripts/services/branches.js b/src/public/app/services/branches.js
similarity index 100%
rename from src/public/javascripts/services/branches.js
rename to src/public/app/services/branches.js
diff --git a/src/public/javascripts/services/bundle.js b/src/public/app/services/bundle.js
similarity index 100%
rename from src/public/javascripts/services/bundle.js
rename to src/public/app/services/bundle.js
diff --git a/src/public/javascripts/services/clipboard.js b/src/public/app/services/clipboard.js
similarity index 100%
rename from src/public/javascripts/services/clipboard.js
rename to src/public/app/services/clipboard.js
diff --git a/src/public/javascripts/services/context_menu.js b/src/public/app/services/context_menu.js
similarity index 100%
rename from src/public/javascripts/services/context_menu.js
rename to src/public/app/services/context_menu.js
diff --git a/src/public/javascripts/services/date_notes.js b/src/public/app/services/date_notes.js
similarity index 100%
rename from src/public/javascripts/services/date_notes.js
rename to src/public/app/services/date_notes.js
diff --git a/src/public/javascripts/services/dialog_command_executor.js b/src/public/app/services/dialog_command_executor.js
similarity index 100%
rename from src/public/javascripts/services/dialog_command_executor.js
rename to src/public/app/services/dialog_command_executor.js
diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/app/services/entrypoints.js
similarity index 100%
rename from src/public/javascripts/services/entrypoints.js
rename to src/public/app/services/entrypoints.js
diff --git a/src/public/javascripts/services/frontend_script_api.js b/src/public/app/services/frontend_script_api.js
similarity index 100%
rename from src/public/javascripts/services/frontend_script_api.js
rename to src/public/app/services/frontend_script_api.js
diff --git a/src/public/javascripts/services/glob.js b/src/public/app/services/glob.js
similarity index 100%
rename from src/public/javascripts/services/glob.js
rename to src/public/app/services/glob.js
diff --git a/src/public/javascripts/services/hoisted_note.js b/src/public/app/services/hoisted_note.js
similarity index 100%
rename from src/public/javascripts/services/hoisted_note.js
rename to src/public/app/services/hoisted_note.js
diff --git a/src/public/javascripts/services/import.js b/src/public/app/services/import.js
similarity index 100%
rename from src/public/javascripts/services/import.js
rename to src/public/app/services/import.js
diff --git a/src/public/javascripts/services/keyboard_actions.js b/src/public/app/services/keyboard_actions.js
similarity index 100%
rename from src/public/javascripts/services/keyboard_actions.js
rename to src/public/app/services/keyboard_actions.js
diff --git a/src/public/javascripts/services/library_loader.js b/src/public/app/services/library_loader.js
similarity index 100%
rename from src/public/javascripts/services/library_loader.js
rename to src/public/app/services/library_loader.js
diff --git a/src/public/javascripts/services/link.js b/src/public/app/services/link.js
similarity index 100%
rename from src/public/javascripts/services/link.js
rename to src/public/app/services/link.js
diff --git a/src/public/javascripts/services/link_map.js b/src/public/app/services/link_map.js
similarity index 100%
rename from src/public/javascripts/services/link_map.js
rename to src/public/app/services/link_map.js
diff --git a/src/public/javascripts/services/load_results.js b/src/public/app/services/load_results.js
similarity index 100%
rename from src/public/javascripts/services/load_results.js
rename to src/public/app/services/load_results.js
diff --git a/src/public/javascripts/services/mac_init.js b/src/public/app/services/mac_init.js
similarity index 100%
rename from src/public/javascripts/services/mac_init.js
rename to src/public/app/services/mac_init.js
diff --git a/src/public/javascripts/services/main_tree_executors.js b/src/public/app/services/main_tree_executors.js
similarity index 100%
rename from src/public/javascripts/services/main_tree_executors.js
rename to src/public/app/services/main_tree_executors.js
diff --git a/src/public/javascripts/services/mime_types.js b/src/public/app/services/mime_types.js
similarity index 100%
rename from src/public/javascripts/services/mime_types.js
rename to src/public/app/services/mime_types.js
diff --git a/src/public/javascripts/services/mutex.js b/src/public/app/services/mutex.js
similarity index 100%
rename from src/public/javascripts/services/mutex.js
rename to src/public/app/services/mutex.js
diff --git a/src/public/javascripts/services/note_autocomplete.js b/src/public/app/services/note_autocomplete.js
similarity index 100%
rename from src/public/javascripts/services/note_autocomplete.js
rename to src/public/app/services/note_autocomplete.js
diff --git a/src/public/javascripts/services/note_content_renderer.js b/src/public/app/services/note_content_renderer.js
similarity index 100%
rename from src/public/javascripts/services/note_content_renderer.js
rename to src/public/app/services/note_content_renderer.js
diff --git a/src/public/javascripts/services/note_create.js b/src/public/app/services/note_create.js
similarity index 100%
rename from src/public/javascripts/services/note_create.js
rename to src/public/app/services/note_create.js
diff --git a/src/public/javascripts/services/note_tooltip.js b/src/public/app/services/note_tooltip.js
similarity index 100%
rename from src/public/javascripts/services/note_tooltip.js
rename to src/public/app/services/note_tooltip.js
diff --git a/src/public/javascripts/services/options.js b/src/public/app/services/options.js
similarity index 100%
rename from src/public/javascripts/services/options.js
rename to src/public/app/services/options.js
diff --git a/src/public/javascripts/services/protected_session.js b/src/public/app/services/protected_session.js
similarity index 100%
rename from src/public/javascripts/services/protected_session.js
rename to src/public/app/services/protected_session.js
diff --git a/src/public/javascripts/services/protected_session_holder.js b/src/public/app/services/protected_session_holder.js
similarity index 100%
rename from src/public/javascripts/services/protected_session_holder.js
rename to src/public/app/services/protected_session_holder.js
diff --git a/src/public/javascripts/services/render.js b/src/public/app/services/render.js
similarity index 100%
rename from src/public/javascripts/services/render.js
rename to src/public/app/services/render.js
diff --git a/src/public/javascripts/services/script_context.js b/src/public/app/services/script_context.js
similarity index 100%
rename from src/public/javascripts/services/script_context.js
rename to src/public/app/services/script_context.js
diff --git a/src/public/javascripts/services/server.js b/src/public/app/services/server.js
similarity index 100%
rename from src/public/javascripts/services/server.js
rename to src/public/app/services/server.js
diff --git a/src/public/javascripts/services/spaced_update.js b/src/public/app/services/spaced_update.js
similarity index 100%
rename from src/public/javascripts/services/spaced_update.js
rename to src/public/app/services/spaced_update.js
diff --git a/src/public/javascripts/services/split.js b/src/public/app/services/split.js
similarity index 100%
rename from src/public/javascripts/services/split.js
rename to src/public/app/services/split.js
diff --git a/src/public/javascripts/services/sync.js b/src/public/app/services/sync.js
similarity index 100%
rename from src/public/javascripts/services/sync.js
rename to src/public/app/services/sync.js
diff --git a/src/public/javascripts/services/tab_context.js b/src/public/app/services/tab_context.js
similarity index 100%
rename from src/public/javascripts/services/tab_context.js
rename to src/public/app/services/tab_context.js
diff --git a/src/public/javascripts/services/tab_manager.js b/src/public/app/services/tab_manager.js
similarity index 100%
rename from src/public/javascripts/services/tab_manager.js
rename to src/public/app/services/tab_manager.js
diff --git a/src/public/javascripts/services/toast.js b/src/public/app/services/toast.js
similarity index 100%
rename from src/public/javascripts/services/toast.js
rename to src/public/app/services/toast.js
diff --git a/src/public/javascripts/services/tree.js b/src/public/app/services/tree.js
similarity index 100%
rename from src/public/javascripts/services/tree.js
rename to src/public/app/services/tree.js
diff --git a/src/public/javascripts/services/tree_builder.js b/src/public/app/services/tree_builder.js
similarity index 100%
rename from src/public/javascripts/services/tree_builder.js
rename to src/public/app/services/tree_builder.js
diff --git a/src/public/javascripts/services/tree_cache.js b/src/public/app/services/tree_cache.js
similarity index 100%
rename from src/public/javascripts/services/tree_cache.js
rename to src/public/app/services/tree_cache.js
diff --git a/src/public/javascripts/services/tree_context_menu.js b/src/public/app/services/tree_context_menu.js
similarity index 100%
rename from src/public/javascripts/services/tree_context_menu.js
rename to src/public/app/services/tree_context_menu.js
diff --git a/src/public/javascripts/services/utils.js b/src/public/app/services/utils.js
similarity index 100%
rename from src/public/javascripts/services/utils.js
rename to src/public/app/services/utils.js
diff --git a/src/public/javascripts/services/ws.js b/src/public/app/services/ws.js
similarity index 100%
rename from src/public/javascripts/services/ws.js
rename to src/public/app/services/ws.js
diff --git a/src/public/javascripts/services/zoom.js b/src/public/app/services/zoom.js
similarity index 100%
rename from src/public/javascripts/services/zoom.js
rename to src/public/app/services/zoom.js
diff --git a/src/public/javascripts/setup.js b/src/public/app/setup.js
similarity index 100%
rename from src/public/javascripts/setup.js
rename to src/public/app/setup.js
diff --git a/src/public/javascripts/widgets/attributes.js b/src/public/app/widgets/attributes.js
similarity index 100%
rename from src/public/javascripts/widgets/attributes.js
rename to src/public/app/widgets/attributes.js
diff --git a/src/public/javascripts/widgets/basic_widget.js b/src/public/app/widgets/basic_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/basic_widget.js
rename to src/public/app/widgets/basic_widget.js
diff --git a/src/public/javascripts/widgets/calendar.js b/src/public/app/widgets/calendar.js
similarity index 100%
rename from src/public/javascripts/widgets/calendar.js
rename to src/public/app/widgets/calendar.js
diff --git a/src/public/javascripts/widgets/close_detail_button.js b/src/public/app/widgets/close_detail_button.js
similarity index 100%
rename from src/public/javascripts/widgets/close_detail_button.js
rename to src/public/app/widgets/close_detail_button.js
diff --git a/src/public/javascripts/widgets/collapsible_widget.js b/src/public/app/widgets/collapsible_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/collapsible_widget.js
rename to src/public/app/widgets/collapsible_widget.js
diff --git a/src/public/javascripts/widgets/component.js b/src/public/app/widgets/component.js
similarity index 100%
rename from src/public/javascripts/widgets/component.js
rename to src/public/app/widgets/component.js
diff --git a/src/public/javascripts/widgets/desktop_layout.js b/src/public/app/widgets/desktop_layout.js
similarity index 100%
rename from src/public/javascripts/widgets/desktop_layout.js
rename to src/public/app/widgets/desktop_layout.js
diff --git a/src/public/javascripts/widgets/edited_notes.js b/src/public/app/widgets/edited_notes.js
similarity index 100%
rename from src/public/javascripts/widgets/edited_notes.js
rename to src/public/app/widgets/edited_notes.js
diff --git a/src/public/javascripts/widgets/flex_container.js b/src/public/app/widgets/flex_container.js
similarity index 100%
rename from src/public/javascripts/widgets/flex_container.js
rename to src/public/app/widgets/flex_container.js
diff --git a/src/public/javascripts/widgets/global_buttons.js b/src/public/app/widgets/global_buttons.js
similarity index 100%
rename from src/public/javascripts/widgets/global_buttons.js
rename to src/public/app/widgets/global_buttons.js
diff --git a/src/public/javascripts/widgets/global_menu.js b/src/public/app/widgets/global_menu.js
similarity index 100%
rename from src/public/javascripts/widgets/global_menu.js
rename to src/public/app/widgets/global_menu.js
diff --git a/src/public/javascripts/widgets/history_navigation.js b/src/public/app/widgets/history_navigation.js
similarity index 100%
rename from src/public/javascripts/widgets/history_navigation.js
rename to src/public/app/widgets/history_navigation.js
diff --git a/src/public/javascripts/widgets/link_map.js b/src/public/app/widgets/link_map.js
similarity index 100%
rename from src/public/javascripts/widgets/link_map.js
rename to src/public/app/widgets/link_map.js
diff --git a/src/public/javascripts/widgets/mobile_detail_menu.js b/src/public/app/widgets/mobile_detail_menu.js
similarity index 100%
rename from src/public/javascripts/widgets/mobile_detail_menu.js
rename to src/public/app/widgets/mobile_detail_menu.js
diff --git a/src/public/javascripts/widgets/mobile_global_buttons.js b/src/public/app/widgets/mobile_global_buttons.js
similarity index 100%
rename from src/public/javascripts/widgets/mobile_global_buttons.js
rename to src/public/app/widgets/mobile_global_buttons.js
diff --git a/src/public/javascripts/widgets/mobile_layout.js b/src/public/app/widgets/mobile_layout.js
similarity index 100%
rename from src/public/javascripts/widgets/mobile_layout.js
rename to src/public/app/widgets/mobile_layout.js
diff --git a/src/public/javascripts/widgets/mobile_screen_switcher.js b/src/public/app/widgets/mobile_screen_switcher.js
similarity index 100%
rename from src/public/javascripts/widgets/mobile_screen_switcher.js
rename to src/public/app/widgets/mobile_screen_switcher.js
diff --git a/src/public/javascripts/widgets/note_actions.js b/src/public/app/widgets/note_actions.js
similarity index 100%
rename from src/public/javascripts/widgets/note_actions.js
rename to src/public/app/widgets/note_actions.js
diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/app/widgets/note_detail.js
similarity index 100%
rename from src/public/javascripts/widgets/note_detail.js
rename to src/public/app/widgets/note_detail.js
diff --git a/src/public/javascripts/widgets/note_info.js b/src/public/app/widgets/note_info.js
similarity index 100%
rename from src/public/javascripts/widgets/note_info.js
rename to src/public/app/widgets/note_info.js
diff --git a/src/public/javascripts/widgets/note_paths.js b/src/public/app/widgets/note_paths.js
similarity index 100%
rename from src/public/javascripts/widgets/note_paths.js
rename to src/public/app/widgets/note_paths.js
diff --git a/src/public/javascripts/widgets/note_revisions.js b/src/public/app/widgets/note_revisions.js
similarity index 100%
rename from src/public/javascripts/widgets/note_revisions.js
rename to src/public/app/widgets/note_revisions.js
diff --git a/src/public/javascripts/widgets/note_title.js b/src/public/app/widgets/note_title.js
similarity index 100%
rename from src/public/javascripts/widgets/note_title.js
rename to src/public/app/widgets/note_title.js
diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
similarity index 100%
rename from src/public/javascripts/widgets/note_tree.js
rename to src/public/app/widgets/note_tree.js
diff --git a/src/public/javascripts/widgets/note_type.js b/src/public/app/widgets/note_type.js
similarity index 100%
rename from src/public/javascripts/widgets/note_type.js
rename to src/public/app/widgets/note_type.js
diff --git a/src/public/javascripts/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js
similarity index 100%
rename from src/public/javascripts/widgets/promoted_attributes.js
rename to src/public/app/widgets/promoted_attributes.js
diff --git a/src/public/javascripts/widgets/protected_note_switch.js b/src/public/app/widgets/protected_note_switch.js
similarity index 100%
rename from src/public/javascripts/widgets/protected_note_switch.js
rename to src/public/app/widgets/protected_note_switch.js
diff --git a/src/public/javascripts/widgets/run_script_buttons.js b/src/public/app/widgets/run_script_buttons.js
similarity index 100%
rename from src/public/javascripts/widgets/run_script_buttons.js
rename to src/public/app/widgets/run_script_buttons.js
diff --git a/src/public/javascripts/widgets/screen_container.js b/src/public/app/widgets/screen_container.js
similarity index 100%
rename from src/public/javascripts/widgets/screen_container.js
rename to src/public/app/widgets/screen_container.js
diff --git a/src/public/javascripts/widgets/search_box.js b/src/public/app/widgets/search_box.js
similarity index 100%
rename from src/public/javascripts/widgets/search_box.js
rename to src/public/app/widgets/search_box.js
diff --git a/src/public/javascripts/widgets/search_results.js b/src/public/app/widgets/search_results.js
similarity index 100%
rename from src/public/javascripts/widgets/search_results.js
rename to src/public/app/widgets/search_results.js
diff --git a/src/public/javascripts/widgets/side_pane_container.js b/src/public/app/widgets/side_pane_container.js
similarity index 100%
rename from src/public/javascripts/widgets/side_pane_container.js
rename to src/public/app/widgets/side_pane_container.js
diff --git a/src/public/javascripts/widgets/side_pane_toggles.js b/src/public/app/widgets/side_pane_toggles.js
similarity index 100%
rename from src/public/javascripts/widgets/side_pane_toggles.js
rename to src/public/app/widgets/side_pane_toggles.js
diff --git a/src/public/javascripts/widgets/similar_notes.js b/src/public/app/widgets/similar_notes.js
similarity index 100%
rename from src/public/javascripts/widgets/similar_notes.js
rename to src/public/app/widgets/similar_notes.js
diff --git a/src/public/javascripts/widgets/standard_top_widget.js b/src/public/app/widgets/standard_top_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/standard_top_widget.js
rename to src/public/app/widgets/standard_top_widget.js
diff --git a/src/public/javascripts/widgets/tab_aware_widget.js b/src/public/app/widgets/tab_aware_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/tab_aware_widget.js
rename to src/public/app/widgets/tab_aware_widget.js
diff --git a/src/public/javascripts/widgets/tab_caching_widget.js b/src/public/app/widgets/tab_caching_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/tab_caching_widget.js
rename to src/public/app/widgets/tab_caching_widget.js
diff --git a/src/public/javascripts/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
similarity index 100%
rename from src/public/javascripts/widgets/tab_row.js
rename to src/public/app/widgets/tab_row.js
diff --git a/src/public/javascripts/widgets/title_bar_buttons.js b/src/public/app/widgets/title_bar_buttons.js
similarity index 100%
rename from src/public/javascripts/widgets/title_bar_buttons.js
rename to src/public/app/widgets/title_bar_buttons.js
diff --git a/src/public/javascripts/widgets/type_widgets/abstract_text_type_widget.js b/src/public/app/widgets/type_widgets/abstract_text_type_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/abstract_text_type_widget.js
rename to src/public/app/widgets/type_widgets/abstract_text_type_widget.js
diff --git a/src/public/javascripts/widgets/type_widgets/book.js b/src/public/app/widgets/type_widgets/book.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/book.js
rename to src/public/app/widgets/type_widgets/book.js
diff --git a/src/public/javascripts/widgets/type_widgets/code.js b/src/public/app/widgets/type_widgets/code.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/code.js
rename to src/public/app/widgets/type_widgets/code.js
diff --git a/src/public/javascripts/widgets/type_widgets/deleted.js b/src/public/app/widgets/type_widgets/deleted.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/deleted.js
rename to src/public/app/widgets/type_widgets/deleted.js
diff --git a/src/public/javascripts/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/editable_text.js
rename to src/public/app/widgets/type_widgets/editable_text.js
diff --git a/src/public/javascripts/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/empty.js
rename to src/public/app/widgets/type_widgets/empty.js
diff --git a/src/public/javascripts/widgets/type_widgets/file.js b/src/public/app/widgets/type_widgets/file.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/file.js
rename to src/public/app/widgets/type_widgets/file.js
diff --git a/src/public/javascripts/widgets/type_widgets/image.js b/src/public/app/widgets/type_widgets/image.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/image.js
rename to src/public/app/widgets/type_widgets/image.js
diff --git a/src/public/javascripts/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/protected_session.js
rename to src/public/app/widgets/type_widgets/protected_session.js
diff --git a/src/public/javascripts/widgets/type_widgets/read_only_text.js b/src/public/app/widgets/type_widgets/read_only_text.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/read_only_text.js
rename to src/public/app/widgets/type_widgets/read_only_text.js
diff --git a/src/public/javascripts/widgets/type_widgets/relation_map.js b/src/public/app/widgets/type_widgets/relation_map.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/relation_map.js
rename to src/public/app/widgets/type_widgets/relation_map.js
diff --git a/src/public/javascripts/widgets/type_widgets/render.js b/src/public/app/widgets/type_widgets/render.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/render.js
rename to src/public/app/widgets/type_widgets/render.js
diff --git a/src/public/javascripts/widgets/type_widgets/search.js b/src/public/app/widgets/type_widgets/search.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/search.js
rename to src/public/app/widgets/type_widgets/search.js
diff --git a/src/public/javascripts/widgets/type_widgets/type_widget.js b/src/public/app/widgets/type_widgets/type_widget.js
similarity index 100%
rename from src/public/javascripts/widgets/type_widgets/type_widget.js
rename to src/public/app/widgets/type_widgets/type_widget.js
diff --git a/src/public/javascripts/widgets/what_links_here.js b/src/public/app/widgets/what_links_here.js
similarity index 100%
rename from src/public/javascripts/widgets/what_links_here.js
rename to src/public/app/widgets/what_links_here.js
diff --git a/src/services/log.js b/src/services/log.js
index 1514c209a..9c2be4187 100644
--- a/src/services/log.js
+++ b/src/services/log.js
@@ -33,7 +33,7 @@ function error(message) {
console.trace(message);
}
-const requestBlacklist = [ "/libraries", "/javascripts", "/images", "/stylesheets" ];
+const requestBlacklist = [ "/libraries", "/app", "/images", "/stylesheets" ];
function request(req) {
for (const bl of requestBlacklist) {
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index 1ee17587b..5f782182b 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -78,7 +78,7 @@
-
+
diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
index 10328f52a..ce73bf0d5 100644
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@@ -131,7 +131,7 @@
-
+
diff --git a/src/views/setup.ejs b/src/views/setup.ejs
index e6963c652..2225d1c7f 100644
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@@ -210,7 +210,7 @@
-
+