infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into mailbox

pull/1/head
yflory 2019-05-16 16:15:28 +02:00
parent 68bd563989 de3bb5cdcf
commit c9f1a69a2e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/outer/mailbox.js
View File

@ -1,3 +1,4 @@
// jshint ignore: start
define([
'/common/common-util.js',
'/common/common-constants.js',

4
www/drive/inner.js
View File

@ -2465,6 +2465,8 @@ define([
var header7, header28, headerOld;
var i = 0;
var channels = [];
$list.append(h('li.cp-app-drive-element-separator', h('span', Messages.drive_active1Day)));
filesList.some(function (arr) {
if (i >= limit) { return true; }
@ -2481,6 +2483,8 @@ define([
var path = paths[0];
if (manager.isPathIn(path, [TRASH])) { return; }
if (channels.indexOf(file.channel) !== -1) { return; }
channels.push(file.channel);
if (!header7 && file.atime < last1) {
$list.append(h('li.cp-app-drive-element-separator', h('span', Messages.drive_active7Days)));