github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into sk-rate-limit-cluster

Browse source
This commit is contained in:
Shane Kilkelly 2017-01-25 10:52:34 +00:00
commit e2f4fc3653
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Announcements/AnnouncementsController.coffee
View file

@ -13,7 +13,7 @@ module.exports =
logger.log {user_id:user?._id}, "getting unread announcements"
AnnouncementsHandler.getUnreadAnnouncements user, (err, announcements)->
if err?
logger.err {err, user_id}, "unable to get unread announcements"
logger.err {err:err, user_id:user._id}, "unable to get unread announcements"
next(err)
else
res.json announcements

7
services/web/public/coffee/main/project-list/project-list.coffee
View file

@ -14,10 +14,9 @@ define [
$scope.searchText =
value : ""
if $scope.projects.length == 0
$timeout () ->
recalculateProjectListHeight()
, 10
$timeout () ->
recalculateProjectListHeight()
, 10
recalculateProjectListHeight = () ->
topOffset = $(".project-list-card")?.offset()?.top