Commit Graph

17 Commits (b1b07a5b9e44efbb0e312710813d3aaf52a61354)

Author SHA1 Message Date
benmcmahon100 b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
benmcmahon100 14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
benmcmahon100 d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
benmcmahon100 0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100 f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100 aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100 0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
	server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
terakilobyte 0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04:00
Quincy Larson b6fc2551d9 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
terakilobyte 870c80d72d Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch. 2015-06-09 16:46:41 -04:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00