You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-12-02 22:49:09 +02:00
Merge branch 'master' into no-babel
This commit is contained in:
@@ -138,7 +138,7 @@ reg.syncHasAuth = (syncTargetId) => {
|
||||
}
|
||||
|
||||
reg.scheduleSync = async (delay = null) => {
|
||||
if (delay === null) delay = 1000 * 10;
|
||||
if (delay === null) delay = 1000 * 3;
|
||||
|
||||
if (reg.scheduleSyncId_) {
|
||||
clearTimeout(reg.scheduleSyncId_);
|
||||
@@ -147,6 +147,11 @@ reg.scheduleSync = async (delay = null) => {
|
||||
|
||||
reg.logger().info('Scheduling sync operation...');
|
||||
|
||||
// if (Setting.value('env') === 'dev') {
|
||||
// reg.logger().info('Scheduling sync operation DISABLED!!!');
|
||||
// return;
|
||||
// }
|
||||
|
||||
const timeoutCallback = async () => {
|
||||
reg.scheduleSyncId_ = null;
|
||||
reg.logger().info('Doing scheduled sync');
|
||||
|
||||
Reference in New Issue
Block a user