github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-27 13:52:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
James Allen 2014-07-29 10:39:07 +01:00
commit df85254d3c
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/coffee/Features/Editor/EditorController.coffee
View file

@ -231,6 +231,7 @@ module.exports = EditorController =
callback()
getLastTimePollHappned: (callback)->
logger.log "getting last time a poll happened in dropbox"
tpdsPollingBackgroundTasks.getLastTimePollHappned callback
updateProjectDescription: (project_id, description, callback = ->)->

2
services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee
View file

@ -314,7 +314,7 @@ module.exports = _.template '''
<td class="headerContent" style="padding: 25px;border-bottom:#dadf90;background-color:#F6F6F6;text-align:left;">
<!-- // Begin Module: Standard Header Image \\ -->
<img src="file:///Users/adamconrad/Code/Work/sharelatex/web/public/img/logo.png" style="max-width:600px;" id="headerImage campaign-icon" />
<img src="https://www.sharelatex.com/img/logo.png" style="max-width:600px;" id="headerImage campaign-icon" />
<!-- // End Module: Standard Header Image \\ -->
</td>

5
services/web/app/coffee/Features/ThirdPartyDataStore/TpdsPollingBackgroundTasks.coffee
View file

@ -32,4 +32,7 @@ self = module.exports =
rclient.set LAST_TIME_POLL_HAPPEND_KEY, new Date().getTime(), callback
getLastTimePollHappned: (callback = (err, lastTimePollHappened)->)->
rclient.get LAST_TIME_POLL_HAPPEND_KEY, callback
rclient.get LAST_TIME_POLL_HAPPEND_KEY, (err, time)->
logger.log lastTimePollHappened:time, "got last time a poll happend to dropbox"
callback(err, time)