benmcmahon100
|
0a59bd5cfb
|
Implemented scroll-locker
|
2015-07-02 21:31:28 +01:00 |
Quincy Larson
|
7e2d5c91e2
|
minor ui improvements
|
2015-06-26 01:28:02 -07: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 |
|
Quincy Larson
|
61486c2d7c
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
|
2015-06-09 13:48:29 -07:00 |
|
terakilobyte
|
d9c3251f94
|
Begin shaping codebase for loopback migration.
|
2015-06-01 18:30:43 -04:00 |