web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'new-messaging' into staging

Browse Source
This commit is contained in:
ansuz
2017-08-25 14:42:34 +02:00
parent 9e04d039d7 22d754d514
commit 57d0c6c973
13 changed files with 1449 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/pages.js
View File

@@ -657,6 +657,10 @@ define([
return loadingScreen();
};
Pages['/contacts2/'] = Pages['/contacts2/index.html'] = function () {
return loadingScreen();
};
Pages['/pad/'] = Pages['/pad/index.html'] = function () {
return loadingScreen();
};

7
customize.dist/template.js
View File

@@ -9,7 +9,7 @@ define([
$(function () {
var $body = $('body');
var isMainApp = function () {
return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile|todo)\/$/.test(location.pathname);
return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|contacts2|drive|settings|profile|todo)\/$/.test(location.pathname);
};
var infoPage = function () {
@@ -52,9 +52,12 @@ $(function () {
} else if (/\/file\//.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/file/main.js' ], ready);
} else if (/contacts/.test(pathname)) {
} else if (/^\/contacts\/$/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/contacts/main.js' ], ready);
} else if (/contacts2/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/contacts2/main.js' ], ready);
} else if (/pad/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/pad/main.js' ], ready);

1
customize.dist/translations/messages.js
View File

@@ -293,6 +293,7 @@ define(function () {
out.contacts_removeHistoryTitle = 'Clean the chat history';
out.contacts_confirmRemoveHistory = 'Are you sure you want to permanently remove your chat history? Data cannot be restored';
out.contacts_removeHistoryServerError = 'There was an error while removing your chat history. Try again later';
out.contacts_fetchHistory = "Retrieve older history";
// File manager