dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into 5.4-rc

This commit is contained in:
yflory 2023-07-13 14:13:34 +02:00
parent 43ec0a7142 860a5b22b5
commit 09bce8d852
38 changed files with 122 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
customize.dist/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 KiB

BIN
customize.dist/favicon/alt-favicon-code.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
customize.dist/favicon/alt-favicon-doc.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-form.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-kanban.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-pad.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-poll.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-presentation.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-sheet.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 KiB

BIN
customize.dist/favicon/alt-favicon-slide.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon-whiteboard.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/alt-favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 KiB

BIN
customize.dist/favicon/main-favicon-code.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 KiB

BIN
customize.dist/favicon/main-favicon-doc.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/main-favicon-form.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/main-favicon-kanban.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
customize.dist/favicon/main-favicon-pad.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
customize.dist/favicon/main-favicon-poll.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/main-favicon-presentation.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/main-favicon-sheet.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 171 KiB

BIN
customize.dist/favicon/main-favicon-slide.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
customize.dist/favicon/main-favicon-teams.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 173 KiB

BIN
customize.dist/favicon/main-favicon-whiteboard.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 170 KiB

BIN
customize.dist/favicon/main-favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 KiB

8
customize.dist/src/less2/include/drive.less
View File

@ -291,7 +291,14 @@
margin-bottom: 3px;
margin-left: -2px;
}
.droppable-tree-element () {
.cp-app-drive-element-droppable {
background-color: @cp_drive-droppable-bg !important;
color: @cp_drive-droppable-fg !important;
}
}
.cp-app-drive-tree-docs {
.droppable-tree-element();
margin-top: 15px;
//padding: 0 0 0 20px;
padding: 0;
@ -346,6 +353,7 @@
border-radius: @variables_radius;
box-shadow: @cryptpad_ui_shadow;
.cp-app-drive-tree-root {
.droppable-tree-element();
.fa-trash-o {
padding-left: 2px;
}

8
www/code/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-code.ico"
data-alt-favicon="/customize/favicon/alt-favicon-code.ico"
href="/customize/favicon/main-favicon-code.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-code.png"
data-alt-favicon="/customize/favicon/alt-favicon-code.png"
href="/customize/favicon/main-favicon-code.png">
</head>
<body>
<noscript></noscript>

28
www/common/notify.js
View File

@ -74,7 +74,6 @@ define(['/api/config'], function (ApiConfig) {
return void console.error('document is not available in this context');
}
console.debug("creating favicon");
var fav = document.createElement('link');
var attrs = {
id: 'favicon',
type: 'image/png',
@ -83,10 +82,29 @@ define(['/api/config'], function (ApiConfig) {
'data-alt-favicon': DEFAULT_ALT,
href: DEFAULT_MAIN,
};
Object.keys(attrs).forEach(function (k) {
fav.setAttribute(k, attrs[k]);
});
document.head.appendChild(fav);
if(!document.getElementById("favicon")) {
var fav = document.createElement('link');
Object.keys(attrs).forEach(function (k) {
fav.setAttribute(k, attrs[k]);
});
document.head.appendChild(fav);
}
if(!document.getElementById("favicon-ico")) {
var faviconLink = document.createElement('link');
attrs.href = attrs.href.replaceAll(".png", ".ico");
attrs.id = 'favicon-ico';
attrs.type = 'image/x-icon';
delete attrs['data-main-favicon'];
delete attrs['data-alt-favicon'];
Object.keys(attrs).forEach(function (k) {
faviconLink.setAttribute(k, attrs[k]);
});
document.head.appendChild(faviconLink);
}
};
if (document && !document.getElementById('favicon')) { createFavicon(); }

3
www/common/onlyoffice/inner.js
View File

@ -2854,6 +2854,9 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null
var $properties = common.createButton('properties', true);
toolbar.$drawer.append($properties);
var $copy = common.createButton('copy', true);
toolbar.$drawer.append($copy);
};
var noCache = false; // Prevent reload loops

8
www/doc/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-doc.ico"
data-alt-favicon="/customize/favicon/alt-favicon-doc.ico"
href="/customize/favicon/main-favicon-doc.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-doc.png"
data-alt-favicon="/customize/favicon/alt-favicon-doc.png"
href="/customize/favicon/main-favicon-doc.png">
</head>
<body>
<noscript></noscript>

8
www/form/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-form.ico"
data-alt-favicon="/customize/favicon/alt-favicon-form.ico"
href="/customize/favicon/main-favicon-form.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-form.png"
data-alt-favicon="/customize/favicon/alt-favicon-form.png"
href="/customize/favicon/main-favicon-form.png">
</head>
<body>
<noscript></noscript>

8
www/kanban/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-kanban.ico"
data-alt-favicon="/customize/favicon/alt-favicon-kanban.ico"
href="/customize/favicon/main-favicon-kanban.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-kanban.png"
data-alt-favicon="/customize/favicon/alt-favicon-kanban.png"
href="/customize/favicon/main-favicon-kanban.png">
</head>
<body>
<noscript></noscript>

8
www/pad/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-pad.ico"
data-alt-favicon="/customize/favicon/alt-favicon-pad.ico"
href="/customize/favicon/main-favicon-pad.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-pad.png"
data-alt-favicon="/customize/favicon/alt-favicon-pad.png"
href="/customize/favicon/main-favicon-pad.png">
</head>
<body>
<noscript></noscript>

8
www/poll/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-poll.ico"
data-alt-favicon="/customize/favicon/alt-favicon-poll.ico"
href="/customize/favicon/main-favicon-poll.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-poll.png"
data-alt-favicon="/customize/favicon/alt-favicon-poll.png"
href="/customize/favicon/main-favicon-poll.png">
</head>
<body>
<noscript></noscript>

8
www/presentation/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-presentation.ico"
data-alt-favicon="/customize/favicon/alt-favicon-presentation.ico"
href="/customize/favicon/main-favicon-presentation.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-presentation.png"
data-alt-favicon="/customize/favicon/alt-favicon-presentation.png"
href="/customize/favicon/main-favicon-presentation.png">
</head>
<body>
<noscript></noscript>

8
www/sheet/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/onlyoffice/main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-sheet.ico"
data-alt-favicon="/customize/favicon/alt-favicon-sheet.ico"
href="/customize/favicon/main-favicon-sheet.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-sheet.png"
data-alt-favicon="/customize/favicon/alt-favicon-sheet.png"
href="/customize/favicon/main-favicon-sheet.png">
</head>
<body>
<noscript></noscript>

8
www/slide/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-slide.ico"
data-alt-favicon="/customize/favicon/alt-favicon-slide.ico"
href="/customize/favicon/main-favicon-slide.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-slide.png"
data-alt-favicon="/customize/favicon/alt-favicon-slide.png"
href="/customize/favicon/main-favicon-slide.png">
</head>
<body>
<noscript></noscript>

8
www/teams/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="main.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-teams.ico"
data-alt-favicon="/customize/favicon/alt-favicon-teams.ico"
href="/customize/favicon/main-favicon-teams.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-teams.png"
data-alt-favicon="/customize/favicon/alt-favicon-teams.png"
href="/customize/favicon/main-favicon-teams.png">
</head>
<body>
<noscript></noscript>

8
www/whiteboard/index.html
View File

@ -9,6 +9,14 @@
<link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
<script async data-bootload="/common/sframe-app-outer.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
<link href="/customize/src/outer.css?ver=1.3.2" rel="stylesheet" type="text/css">
<link id="favicon-ico" type="image/x-icon" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-whiteboard.ico"
data-alt-favicon="/customize/favicon/alt-favicon-whiteboard.ico"
href="/customize/favicon/main-favicon-whiteboard.ico">
<link id="favicon" type="image/png" rel="icon"
data-main-favicon="/customize/favicon/main-favicon-whiteboard.png"
data-alt-favicon="/customize/favicon/alt-favicon-whiteboard.png"
href="/customize/favicon/main-favicon-whiteboard.png">
</head>
<body>
<noscript></noscript>