mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-05-02 17:03:42 -04:00
Merge branch 'master' of https://github.com/codecombat/codecombat
This commit is contained in:
commit
88da89433e
1 changed files with 2 additions and 2 deletions
|
@ -42,7 +42,7 @@ candidateUpdateProfileTask = ->
|
||||||
lockDurationMs = 2 * 60 * 1000
|
lockDurationMs = 2 * 60 * 1000
|
||||||
currentDate = new Date()
|
currentDate = new Date()
|
||||||
timeRanges = []
|
timeRanges = []
|
||||||
for weekPair in [[4, 2,'two weeks'], [8, 4, 'four weeks'], [8, 52, 'eight weeks']]
|
for weekPair in [[4, 2,'two weeks'], [8, 4, 'four weeks'], [52, 8, 'eight weeks']]
|
||||||
timeRanges.push
|
timeRanges.push
|
||||||
start: generateWeekOffset currentDate, weekPair[0]
|
start: generateWeekOffset currentDate, weekPair[0]
|
||||||
end: generateWeekOffset currentDate, weekPair[1]
|
end: generateWeekOffset currentDate, weekPair[1]
|
||||||
|
@ -252,7 +252,7 @@ makeEmployerNamesEasilyAccessible = (allEmployers, cb) ->
|
||||||
|
|
||||||
employersEmailedDigestMoreThanWeekAgoFilter = (employer, cb) ->
|
employersEmailedDigestMoreThanWeekAgoFilter = (employer, cb) ->
|
||||||
if employer.emails?.employerNotes?.enabled is false
|
if employer.emails?.employerNotes?.enabled is false
|
||||||
return sentEmailFilterCallback true
|
return cb true
|
||||||
findParameters =
|
findParameters =
|
||||||
"user": employer._id
|
"user": employer._id
|
||||||
"mailTask": @mailTaskName
|
"mailTask": @mailTaskName
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue