codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 11:58:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-06-08 11:52:32 -06:00
commit dde45262b0
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/account/profile_view.coffee
View file

@ -70,7 +70,7 @@ module.exports = class ProfileView extends View
context.allowedToEditJobProfile = @user and (me.isAdmin() or (context.myProfile && !me.get('anonymous'))) context.allowedToEditJobProfile = @user and (me.isAdmin() or (context.myProfile && !me.get('anonymous')))
context.profileApproved = @user?.get 'jobProfileApproved' context.profileApproved = @user?.get 'jobProfileApproved'
context.progress = @progress ? @updateProgress() context.progress = @progress ? @updateProgress()
@editing ?= context.progress < 0.8 @editing ?= context.myProfile and context.progress < 0.8
context.editing = @editing context.editing = @editing
context.marked = marked context.marked = marked
context.moment = moment context.moment = moment

2
server/users/user_handler.coffee
View file

@ -150,7 +150,7 @@ UserHandler = class UserHandler extends Handler
return @sendDatabaseError(res, err) if err return @sendDatabaseError(res, err) if err
res.send JSON.stringify(count + 1) res.send JSON.stringify(count + 1)
getSimulatorLeaderboardQueryParameters: (req) -> getSimulatorLeaderboardQueryParameters: (req) ->
@validateSimulateLeaderboardRequestParameters(req) @validateSimulateLeaderboardRequestParameters(req)
query = {} query = {}

4
server_setup.coffee
View file

@ -48,7 +48,7 @@ setupPassportMiddleware = (app) ->
app.use(authentication.initialize()) app.use(authentication.initialize())
app.use(authentication.session()) app.use(authentication.session())
setupOneSecondDelayMiddlware = (app) -> setupOneSecondDelayMiddleware = (app) ->
if(config.slow_down) if(config.slow_down)
app.use((req, res, next) -> setTimeout((-> next()), 1000)) app.use((req, res, next) -> setTimeout((-> next()), 1000))
@ -74,7 +74,7 @@ exports.setupMiddleware = (app) ->
setupMiddlewareToSendOldBrowserWarningWhenPlayersViewLevelDirectly app setupMiddlewareToSendOldBrowserWarningWhenPlayersViewLevelDirectly app
setupExpressMiddleware app setupExpressMiddleware app
setupPassportMiddleware app setupPassportMiddleware app
setupOneSecondDelayMiddlware app setupOneSecondDelayMiddleware app
###Routing function implementations### ###Routing function implementations###