github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-09 12:35:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	app/coffee/Features/Notifications/NotificationsBuilder.coffee
This commit is contained in:
Shane Kilkelly 2016-08-31 09:48:19 +01:00
commit 1b29e0e8ec
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/coffee/Features/Compile/CompileController.coffee
View file

@ -151,9 +151,9 @@ module.exports = CompileController =
{page, h, v} = req.query
if not page?.match(/^\d+$/)
return next(new Error("invalid page parameter"))
if not h?.match(/^\d+\.\d+$/)
if not h?.match(/^-?\d+\.\d+$/)
return next(new Error("invalid h parameter"))
if not v?.match(/^\d+\.\d+$/)
if not v?.match(/^-?\d+\.\d+$/)
return next(new Error("invalid v parameter"))
# whether this request is going to a per-user container
CompileController._compileAsUser req, (error, user_id) ->

2
services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee
View file

@ -11,7 +11,7 @@ module.exports =
messageOpts =
groupName: licence.name
subscription_id: licence.subscription_id
logger.log user_id:user._id, key: @key, "creating notification key for user"
logger.log user_id:user._id, key:@key, "creating notification key for user"
NotificationsHandler.createNotification user._id, @key, "notification_group_invite", messageOpts, null, callback
read: (callback = ->)->