mirror of
https://github.com/wekan/wekan.git
synced 2025-04-22 21:17:18 -04:00
Add Feature: Comments can be richer (can support some safe HTML tags)
This commit is contained in:
commit
0291bcde17
7 changed files with 1469 additions and 1461 deletions
|
@ -95,3 +95,4 @@ meteorhacks:aggregate@1.3.0
|
|||
wekan-markdown
|
||||
konecty:mongo-counter
|
||||
summernote:summernote
|
||||
percolate:synced-cron
|
||||
|
|
|
@ -137,6 +137,7 @@ peerlibrary:base-component@0.16.0
|
|||
peerlibrary:blaze-components@0.15.1
|
||||
peerlibrary:computed-field@0.9.0
|
||||
peerlibrary:reactive-field@0.5.0
|
||||
percolate:synced-cron@1.3.2
|
||||
promise@0.11.2
|
||||
raix:eventemitter@0.1.3
|
||||
raix:handlebar-helpers@0.2.5
|
||||
|
|
1444
i18n/es-AR.i18n.json
1444
i18n/es-AR.i18n.json
File diff suppressed because it is too large
Load diff
1444
i18n/es.i18n.json
1444
i18n/es.i18n.json
File diff suppressed because it is too large
Load diff
|
@ -21,7 +21,7 @@ Package.onUse(function(api) {
|
|||
|
||||
api.use('accounts-base', 'server');
|
||||
api.use('accounts-password', 'server');
|
||||
|
||||
api.use('percolate:synced-cron', 'server');
|
||||
api.addFiles('client/loginHelper.js', 'client');
|
||||
|
||||
api.mainModule('server/index.js', 'server');
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import _ from 'underscore';
|
||||
import SyncedCron from 'meteor/percolate:synced-cron';
|
||||
import LDAP from './ldap';
|
||||
import { log_debug, log_info, log_warn, log_error } from './logger';
|
||||
|
||||
|
@ -418,30 +419,35 @@ function sync() {
|
|||
const jobName = 'LDAP_Sync';
|
||||
|
||||
const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounced() {
|
||||
let sc=SyncedCron.SyncedCron; //Why ?? something must be wrong in the import
|
||||
if (LDAP.settings_get('LDAP_BACKGROUND_SYNC') !== true) {
|
||||
log_info('Disabling LDAP Background Sync');
|
||||
if (SyncedCron.nextScheduledAtDate(jobName)) {
|
||||
SyncedCron.remove(jobName);
|
||||
if (sc.nextScheduledAtDate(jobName)) {
|
||||
sc.remove(jobName);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) {
|
||||
log_info('Enabling LDAP Background Sync');
|
||||
SyncedCron.add({
|
||||
name: jobName,
|
||||
schedule: (parser) => parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')),
|
||||
job() {
|
||||
sync();
|
||||
},
|
||||
});
|
||||
SyncedCron.start();
|
||||
}
|
||||
log_info('Enabling LDAP Background Sync');
|
||||
sc.add({
|
||||
name: jobName,
|
||||
schedule: function(parser) {
|
||||
if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) {
|
||||
return parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL'));
|
||||
}
|
||||
else {
|
||||
return parser.recur().on(0).minute();
|
||||
}},
|
||||
job: function() {
|
||||
sync();
|
||||
},
|
||||
});
|
||||
sc.start();
|
||||
|
||||
}), 500);
|
||||
|
||||
Meteor.startup(() => {
|
||||
Meteor.defer(() => {
|
||||
LDAP.settings_get('LDAP_BACKGROUND_SYNC', addCronJob);
|
||||
LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL', addCronJob);
|
||||
if(LDAP.settings_get('LDAP_BACKGROUND_SYNC')){addCronJob();}
|
||||
});
|
||||
});
|
||||
|
|
|
@ -65,7 +65,7 @@ apps:
|
|||
|
||||
parts:
|
||||
mongodb:
|
||||
source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/binary-amd64/mongodb-org-server_4.0.10_amd64.deb
|
||||
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-4.0.10.tgz
|
||||
plugin: dump
|
||||
stage-packages: [libssl1.0.0]
|
||||
filesets:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue