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

Merge branch '5.7-rc' of github.com:cryptpad/cryptpad into 5.7-rc

This commit is contained in:
yflory 2024-01-30 14:26:22 +01:00
parent 36055d261b fe036f88e8
commit 6daf688e91
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commands/invitation.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
/*jshint esversion: 6 */ /*jshint esversion: 6 */
const Invitation = module.exports; const Invitation = module.exports;

4
lib/commands/users.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
/*jshint esversion: 6 */ /*jshint esversion: 6 */
const Users = module.exports; const Users = module.exports;

4
lib/storage/invite.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
const Basic = require("./basic.js"); const Basic = require("./basic.js");
const Path = require("node:path"); const Path = require("node:path");
const nThen = require('nthen'); const nThen = require('nthen');

4
lib/storage/user.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
const Basic = require("./basic.js"); const Basic = require("./basic.js");
const Path = require("node:path"); const Path = require("node:path");
const nThen = require('nthen'); const nThen = require('nthen');

4
www/common/inner/image-dialog.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
define([], function() { define([], function() {
const openImageDialog = function(common, integrationChannel, data, cb) { const openImageDialog = function(common, integrationChannel, data, cb) {

4
www/diagram/util.js
View File

@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
//
// SPDX-License-Identifier: AGPL-3.0-or-later
define([ define([
'/common/common-util.js', '/common/common-util.js',
'/file/file-crypto.js', '/file/file-crypto.js',