Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
4eeea93265
|
@ -20,5 +20,16 @@ define([], function () {
|
|||
};
|
||||
}
|
||||
|
||||
if (!localStorage || typeof(localStorage.getItem) !== 'function') {
|
||||
require('jquery', function ($) {
|
||||
$.ajax({
|
||||
type: 'HEAD',
|
||||
url: '/common/feedback.html?NO_LOCALSTORAGE=' + (+new Date()),
|
||||
});
|
||||
});
|
||||
window.alert("CryptPad needs localStorage to work, try a different browser");
|
||||
return;
|
||||
}
|
||||
|
||||
require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
|
||||
});
|
||||
|
|
|
@ -2689,7 +2689,7 @@ define([
|
|||
if (err) { return void logError(err); }
|
||||
$leftside.html('');
|
||||
$leftside.append($limitContainer);
|
||||
});
|
||||
}, true);
|
||||
|
||||
/* add a history button */
|
||||
var histConfig = {
|
||||
|
|
Loading…
Reference in New Issue