Commit c91f33ad authored by yPhil's avatar yPhil
Browse files

Merge branch 'dev'

parents 25187b31 0598cae0
Pipeline #496070 passed with stage
in 37 seconds
......@@ -60,6 +60,7 @@ npm start
`xdg-open http://localhost:8000` or `xdg-open https://localhost:8001`
♻️NB - This repository is mirrored [here](https://gitlab.com/yphil/petrolette).
### Update
......
......@@ -31,7 +31,7 @@ app.use(
defaultSrc: ["'self'", "https://www.googleapis.com", "https://api.dropboxapi.com", "https://content.dropboxapi.com", "https:"],
imgSrc: ["'self'", "'unsafe-inline'", "https:", "data:"],
styleSrc: ["'self'", "'unsafe-inline'"],
scriptSrc: ["'self'", "'unsafe-inline'"],
scriptSrc: ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
scriptSrcAttr: null
}
})
......@@ -44,22 +44,18 @@ app.use(bodyParser.urlencoded({ extended: false }));
// app.use(express.static(__dirname + '/public', { dotfiles: 'allow' }));
app.use('/favicons', express.static(path.join(__dirname, pjson.FAVICONS_CACHE_DIR)));
app.use('/static', express.static(path.join(__dirname, 'public')));
app.use('/static', express.static(path.join(__dirname, 'public'), { dotfiles: 'allow' }));
app.use('/introjs', express.static(path.join(__dirname, 'node_modules', 'intro.js')));
app.use('/jquery', express.static(path.join(__dirname, 'node_modules', 'jquery', 'dist')));
app.use('/jquery-ui', express.static(path.join(__dirname, 'node_modules', 'jquery-ui-dist')));
app.use('/fancybox', express.static(path.join(__dirname, 'node_modules', '@fancyapps', 'fancybox', 'dist')));
app.use('/responsively-lazy', express.static(path.join(__dirname, 'node_modules', 'responsively-lazy')));
app.use('/rs', express.static(path.join(__dirname, 'node_modules', 'remotestoragejs', 'release')));
app.use('/rs-widget', express.static(path.join(__dirname, 'node_modules', 'remotestorage-widget', 'build')));
app.use('/dompurify', express.static(path.join(__dirname, 'node_modules', 'dompurify', 'dist')));
app.use('/mousetrap', express.static(path.join(__dirname, 'node_modules', 'mousetrap')));
app.use('/', router);
module.exports = app;
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?1393632');
src: url('../font/fontello.eot?1393632#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?1393632') format('woff2'),
url('../font/fontello.woff?1393632') format('woff'),
url('../font/fontello.ttf?1393632') format('truetype'),
url('../font/fontello.svg?1393632#fontello') format('svg');
src: url('../font/fontello.eot?91727100');
src: url('../font/fontello.eot?91727100#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?91727100') format('woff2'),
url('../font/fontello.woff?91727100') format('woff'),
url('../font/fontello.ttf?91727100') format('truetype'),
url('../font/fontello.svg?91727100#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
......@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?1393632#fontello') format('svg');
src: url('../font/fontello.svg?91727100#fontello') format('svg');
}
}
*/
......@@ -59,7 +59,6 @@
.icon-search-circled:before { content: '\e802'; } /* '' */
.icon-upload:before { content: '\e803'; } /* '' */
.icon-up:before { content: '\e804'; } /* '' */
.icon-lock:before { content: '\e805'; } /* '' */
.icon-right:before { content: '\e806'; } /* '' */
.icon-rss:before { content: '\e807'; } /* '' */
.icon-warning:before { content: '\e808'; } /* '' */
......@@ -74,7 +73,6 @@
.icon-menu:before { content: '\e815'; } /* '' */
.icon-cancel:before { content: '\e816'; } /* '' */
.icon-refresh:before { content: '\e817'; } /* '' */
.icon-pencil:before { content: '\e818'; } /* '' */
.icon-checkbox:before { content: '\e81a'; } /* '' */
.icon-cog:before { content: '\e81b'; } /* '' */
.icon-pin:before { content: '\e820'; } /* '' */
......@@ -88,6 +86,7 @@
.icon-video:before { content: '\e829'; } /* '' */
.icon-w3c:before { content: '\e830'; } /* '' */
.icon-down:before { content: '\e832'; } /* '' */
.icon-lock-open:before { content: '\f13e'; } /* '' */
.icon-heartbeat:before { content: '\f21e'; } /* '' */
.icon-paypal:before { content: '\f342'; } /* '' */
.icon-reset:before { content: '\f831'; } /* '' */
......@@ -1633,3 +1633,8 @@ div#nagBar > div#nagTwo > button {
user-select: none;
overflow: visible;
}
.insecureIcon {
margin: 0 0.2em 0 0;
font-size: 1em;
}
......@@ -104,12 +104,6 @@
"code": 59415,
"src": "fontawesome"
},
{
"uid": "c77fd2fd065b5fe16d6f2b41e190b266",
"css": "pencil",
"code": 59416,
"src": "entypo"
},
{
"uid": "c91522256a4c3972e9a2765b995b7252",
"css": "pin",
......@@ -224,17 +218,17 @@
"code": 59394,
"src": "elusive"
},
{
"uid": "95c84da411a955a12baff8b0859c9276",
"css": "lock",
"code": 59397,
"src": "websymbols"
},
{
"uid": "97ac1a82370ae58f02e4ff1bdc58ee86",
"css": "warning",
"code": 59400,
"src": "websymbols"
},
{
"uid": "05376be04a27d5a46e855a233d6e8508",
"css": "lock-open",
"code": 61758,
"src": "fontawesome"
}
]
}
\ No newline at end of file
No preview for this file type
......@@ -16,8 +16,6 @@
<glyph glyph-name="up" unicode="&#xe804;" d="M366 790l334-334q31-31 31-73t-31-74-74-31-73 31l-83 82 0-377q0-44-31-74t-73-30q-43 0-74 31t-31 73l0 377-82-82q-31-31-74-31t-74 31-31 74 31 73z" horiz-adv-x="731" />
<glyph glyph-name="lock" unicode="&#xe805;" d="M582 437v-356q0-32-32-32h-518q-32 0-32 32v356q0 10 3 17t7 10 12 5 13 2 16 0 14-1v127h1q9 87 74 141t153 53 151-62 71-152h1l2-107q4 0 15 1t15 0 13-2 12-5 6-10 3-17z m-161 162q0 51-37 74t-91 23q-53 0-92-25t-39-77v-124h259v129z" horiz-adv-x="582" />
<glyph glyph-name="right" unicode="&#xe806;" d="M0-2l352 352-352 352 148 148 352-351 148-149-148-148-352-352z" horiz-adv-x="648" />
<glyph glyph-name="rss" unicode="&#xe807;" d="M286 136q0 29-21 50t-51 21-50-21-21-50 21-51 50-21 51 21 21 51z m196-53q-8 130-99 222t-221 98q-8 1-14-5t-5-13v-71q0-7 5-12t12-6q86-6 147-68t67-147q1-7 6-12t12-5h72q7 0 13 6t5 13z m214 0q-3 86-31 166t-78 145-115 114-145 78-166 31q-7 1-13-5-5-5-5-13v-71q0-7 5-12t12-6q114-4 211-62t156-155 62-211q0-8 5-13t13-5h71q7 0 13 6 6 5 5 13z m161 535v-536q0-66-47-113t-114-48h-535q-67 0-114 48t-47 113v536q0 66 47 113t114 48h535q67 0 114-48t47-113z" horiz-adv-x="857.1" />
......@@ -46,8 +44,6 @@
<glyph glyph-name="refresh" unicode="&#xe817;" d="M843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-36 90-57t105-20q74 0 139 37t104 99q6 10 30 66 4 13 16 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
<glyph glyph-name="pencil" unicode="&#xe818;" d="M718 680q32-32 47-64t15-48l0-16-252-252-290-288-238-52 50 240 290 288 252 252q54 12 126-60z m-494-640l24 24q-2 44-52 94-22 22-45 35t-35 13l-14 2-22-24-18-80q28-16 46-34 24-24 36-48z" horiz-adv-x="780" />
<glyph glyph-name="checkbox" unicode="&#xe81a;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m109 0q0-162 115-276t276-115 276 115 115 276-115 276-276 115-276-115-115-276z m106-51l94 92 93-94 289 291 94-93-291-289-92-94-93 94z" horiz-adv-x="1000" />
<glyph glyph-name="cog" unicode="&#xe81b;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m195-47l92-10q8-29 22-52l-59-73 68-68 73 59q23-14 52-22l10-92 94 0 10 92q29 8 52 22l73-59 68 68-59 73q14 23 22 52l92 10 0 94-92 10q-8 29-22 52l59 73-68 68-73-59q-23 14-52 22l-10 92-94 0-10-92q-29-8-52-22l-73 59-68-68 59-73q-14-23-22-52l-92-10 0-94z m217 47q0 37 26 63t62 25 63-25 25-63-25-62-63-26-62 26-26 62z" horiz-adv-x="1000" />
......@@ -74,6 +70,8 @@
<glyph glyph-name="down" unicode="&#xe832;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m248 55l252-377 252 377-135 0 0 267-234 0 0-267-135 0z" horiz-adv-x="1000" />
<glyph glyph-name="lock-open" unicode="&#xf13e;" d="M589 421q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v179q0 103 74 177t176 73 177-73 73-177q0-14-10-25t-25-11h-36q-14 0-25 11t-11 25q0 59-42 101t-101 42-101-42-41-101v-179h410z" horiz-adv-x="642.9" />
<glyph glyph-name="heartbeat" unicode="&#xf21e;" d="M714 279h171q-3-4-6-6t-5-4l-2-3-347-335q-10-10-25-10t-25 10l-348 336q-3 2-11 12h205q13 0 23 7t12 19l39 157 106-372q4-11 13-18t22-8q11 0 21 8t13 18l81 271 32-63q10-19 31-19z m286 238q0-80-57-167h-206l-62 123q-5 10-15 15t-20 5q-25-3-31-26l-72-240-109 383q-4 11-14 19t-22 7-21-8-13-19l-64-259h-236q-58 87-58 167 0 123 71 192t196 70q34 0 70-12t67-33 54-38 42-38q20 20 42 38t54 38 67 33 70 12q125 0 196-70t71-192z" horiz-adv-x="1000" />
<glyph glyph-name="paypal" unicode="&#xf342;" d="M771 610l8-4q38-22 60-62 20-38 20-96 0-130-110-210-106-80-306-80l-30 0q-16 0-32-12t-20-28l-36-156q-12-42-52-42l-106 0q-18 0-28 13t-6 29l6 24 68 0q16 0 32 13t20 29l36 156q10 40 52 40l30 0q196 0 306 80 110 82 110 210 0 56-22 96z m-580-516q-2-16-18-29t-32-13l-108 0q-18 0-27 13t-5 29l150 646q10 40 52 40l224 0q78 0 126-8 56-12 94-34 36-24 58-62 20-38 20-96 0-130-110-210-106-80-304-80l-32 0q-16 0-32-12t-18-28z m88 374q-4-16 6-28t26-12l28 0q86 0 134 36 48 34 48 98 0 44-30 64-32 20-94 20l-34 0q-42 0-52-40z" horiz-adv-x="859" />
......
No preview for this file type
......@@ -200,7 +200,9 @@ PTL.i18n.translations = {
"Add a column" : { fr: "Ajouter une colonne" , ja: "列を追加する", es: "Agrega una columna" },
"This field cannot be empty" : { fr: "Ce champ ne peut pas être vide" , ja: "このフィールドを空にすることはできません", es: "Esta entrada de texto no puede estar vacía" },
"Warning: Some linked elements (image, audio or video) within this feed's items could not be loaded because they were served insecurely" : { fr: "Notification: Certains éléments liés (image, audio ou vidéo) dans les articles de ce flux n'ont pas pu être chargés, car ils sont diffusés de manière non sécurisée" , ja: "警告:このフィードのアイテム内の一部のリンクされた要素(画像、音声、または動画)は、安全に提供されなかったため、読み込むことができませんでした", es: "Advertencia: Algunos elementos vinculados (imagen, audio o video) dentro de los elementos de este feed no se pudieron cargar porque se publicaron de manera insegura." },
"Add this feed" : { fr: "Ajouter ce flux" , ja: "このフィードを追加する", es: "Añadir este feed" },
"Some linked elements (image, audio or video) within this feed's items could not be loaded because they were served insecurely" : { fr: "Certains éléments liés (image, audio ou vidéo) dans les articles de ce flux n'ont pas pu être chargés, car ils sont diffusés de manière non sécurisée" , ja: "このフィードのアイテム内の一部のリンクされた要素(画像、音声、または動画)は、安全に提供されなかったため、読み込むことができませんでした", es: "Algunos elementos vinculados (imagen, audio o video) dentro de los elementos de este feed no se pudieron cargar porque se publicaron de manera insegura." },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment