gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

Browse Source
This commit is contained in:
Quincy Larson
2015-05-25 23:40:55 -07:00
parent c4e8c03cef 6ce5ccf449
commit 4991d2c07d
4 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/challenge.js
View File

@ -130,7 +130,6 @@ exports.returnCurrentChallenge = function(req, res, next) {
if (err) { if (err) {
return next(err); return next(err);
} }
return res.redirect('../challenges/learn-how-free-code-camp-works');
}); });
} }
var nameString = req.user.currentChallenge.challengeName.trim() var nameString = req.user.currentChallenge.challengeName.trim()

0
public/js/lib/coursewares/coursewaresHCJQFramework_0.1.1.js → public/js/lib/coursewares/coursewaresHCJQFramework_0.1.2.js
View File

1
views/challengeMap/show.jade
View File

@ -1,7 +1,6 @@
extends ../layout extends ../layout
block content block content
script. script.
var bonfireList = !{JSON.stringify(bonfires)};
var waypointList = !{JSON.stringify(waypoints)}; var waypointList = !{JSON.stringify(waypoints)};
var ziplineList = !{JSON.stringify(ziplines)}; var ziplineList = !{JSON.stringify(ziplines)};
var basejumpList = !{JSON.stringify(basejumps)}; var basejumpList = !{JSON.stringify(basejumps)};

4
views/coursewares/showHTML.jade
View File

@ -14,7 +14,7 @@ block content
link(rel="stylesheet", href="http://fonts.googleapis.com/css?family=Ubuntu+Mono") link(rel="stylesheet", href="http://fonts.googleapis.com/css?family=Ubuntu+Mono")
script(src='/js/lib/codemirror/mode/javascript/javascript.js') script(src='/js/lib/codemirror/mode/javascript/javascript.js')
script(src='/js/lib/jailed/jailed.js') script(src='/js/lib/jailed/jailed.js')
script(src='/js/lib/bonfire/sandbox.js') script(src='/js/lib/coursewares/sandbox.js')
script(src='/js/lib/codemirror/mode/xml/xml.js') script(src='/js/lib/codemirror/mode/xml/xml.js')
script(src='/js/lib/codemirror/mode/css/css.js') script(src='/js/lib/codemirror/mode/css/css.js')
script(src='/js/lib/codemirror/mode/htmlmixed/htmlmixed.js') script(src='/js/lib/codemirror/mode/htmlmixed/htmlmixed.js')
@ -90,4 +90,4 @@ block content
.animated.zoomInDown.delay-half .animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.1.js") script(src="/js/lib/coursewares/coursewaresHCJQFramework_0.1.2.js")