Quincy Larson 8cb33be491 Merge branch 'staging' into clementine ...

Conflicts:
	seed/challenges/basejumps.json

2015-10-25 22:15:59 -07:00

..

advanced-bonfires.json

remove test based on closed @saadanerdetbare PR, closes #3362

2015-10-24 01:21:01 -07:00

angularjs.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

automated-testing-and-debugging.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

basejumps.json

Merge branch 'staging' into clementine

2015-10-25 22:15:59 -07:00

basic-bonfires.json

Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging

2015-10-24 01:26:30 -07:00

basic-javascript.json

fix waypoint typo

2015-10-25 19:47:02 -07:00

basic-ziplines.json

Fix typo in basic-ziplines

2015-10-20 23:09:08 -04:00

bootstrap.json

Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats

2015-10-24 01:33:26 -07:00

front-end-development-certificate.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

full-stack-development-certificate.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

gear-up-for-success.json

Merge pull request #3727 from QuincyLarson/estimates

2015-10-13 15:49:39 -07:00

getting-started.json

Merge pull request #3727 from QuincyLarson/estimates

2015-10-13 15:49:39 -07:00

git.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

hikes.json

add time estimates to challenge blocks on map

2015-10-12 22:56:10 -07:00

html5-and-css.json

Merge pull request #3827 from junhaoyap/fix/style-elements

2015-10-21 23:57:13 -07:00

intermediate-bonfires.json

Merge pull request #3620 from ltegman/fix-everything-be-true-tests-3394

2015-10-23 22:41:12 -07:00

intermediate-ziplines.json

update weather challenge with api key

2015-10-22 02:14:34 -07:00

jquery.json

Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging

2015-10-23 22:12:26 -07:00

json-apis-and-ajax.json

finish editing ajax challenges

2015-10-23 21:32:51 -07:00

mongodb.json

Updating the waypoint information

2015-10-21 23:49:17 -04:00

nodejs-and-expressjs.json

Corrected typo - missing period.

2015-10-18 09:01:51 -07:00

object-oriented-and-functional-programming.json

Add Better Explanations to the Functional Programming Lessons

2015-10-17 23:11:03 -07:00

upper-intermediate-bonfires.json

add solutions to challenges object and add solutions for upper intermediate bonfires

2015-10-21 15:04:58 -07:00