The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into soon

Browse Source
This commit is contained in:
ansuz 2020-09-22 11:33:37 +05:30
commit 02e93e2937
8 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
datastore
tasks
www/bower_components/*
www/accounts
node_modules
/config.js
customization

1
.jshintignore
View File

@ -15,6 +15,7 @@ www/common/onlyoffice/v2*
server.js
www/common/old-media-tag.js
www/scratch
www/accounts
www/lib
www/accounts

8
customize.dist/ckeditor-contents.css
View File

@ -205,3 +205,11 @@ a > img {
.cp-link-clicked a {
cursor: pointer;
}
media-tag {
display: inline-block;
}
media-tag * {
width: 100%;
height: 100%;
}

5
www/common/common-ui-elements.js
View File

@ -418,7 +418,7 @@ define([
var localStore = window.cryptpadStore;
localStore.get('hide-alert-teamInvite', function (val) {
if (val === '1') { return; }
$(linkWarning).show();
$(linkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-teamInvite', '1');
@ -1281,6 +1281,9 @@ define([
cb(null, $container);
return {
$container: $container,
update: function () {
common.getPinUsage(teamId, todo);
},
stop: function () {
clearInterval(interval);
}

5
www/common/diffMarked.js
View File

@ -7,14 +7,15 @@ define([
'/common/hyperscript.js',
'/common/inner/common-mediatag.js',
'/common/media-tag.js',
'/common/highlight/highlight.pack.js',
'/customize/messages.js',
'/common/highlight/highlight.pack.js',
'/bower_components/diff-dom/diffDOM.js',
'/bower_components/tweetnacl/nacl-fast.min.js',
'css!/common/highlight/styles/github.css'
],function ($, ApiConfig, Marked, Hash, Util, h, MT, MediaTag, Highlight, Messages) {
],function ($, ApiConfig, Marked, Hash, Util, h, MT, MediaTag, Messages) {
var DiffMd = {};
var Highlight = window.hljs;
var DiffDOM = window.diffDOM;
var renderer = new Marked.Renderer();
var restrictedRenderer = new Marked.Renderer();

13
www/common/drive-ui.js
View File

@ -1,6 +1,6 @@
define([
'jquery',
'/api/config/',
'/api/config',
'/common/toolbar.js',
'json.sortify',
'/common/common-util.js',
@ -153,6 +153,17 @@ define([
var localStore = window.cryptpadStore;
APP.store = {};
$(window).keydown(function (e) {
if (e.which === 70 && e.ctrlKey) {
e.preventDefault();
e.stopPropagation();
if (APP.displayDirectory) {
APP.displayDirectory([SEARCH]);
}
return;
}
});
var makeLS = function (teamId) {
var suffix = teamId ? ('-' + teamId) : '';
var LS_LAST = "app-drive-lastOpened" + suffix;

8
www/common/highlight/highlight.pack.js
View File

File diff suppressed because one or more lines are too long

8
www/common/inner/share.js
View File

@ -341,7 +341,7 @@ define([
localStore.get('hide-alert-shareLinkWarning', function (val) {
if (val === '1') { return; }
$(shareLinkWarning).show();
$(shareLinkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-shareLinkWarning', '1');
@ -362,7 +362,9 @@ define([
}));
});
Messages.share_bar = "Generate link"; // XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
//Messages.share_bar = "Generate link"; // XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
Messages.share_bar = Messages.team_inviteLinkCreate; // XXX
var linkButtons = [
makeCancelButton(),
!opts.sharedFolder && {
@ -737,7 +739,7 @@ define([
localStore.get('hide-alert-shareLinkWarning', function (val) {
if (val === '1') { return; }
$(shareLinkWarning).show();
$(shareLinkWarning).css('display', 'flex');
$(dismissButton).on('click', function () {
localStore.put('hide-alert-shareLinkWarning', '1');