Quincy Larson fd7451e233 Merge branch 'staging' into improve-early-challenges ...

Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json

2015-10-28 02:20:09 -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

revert to old basejump.json

2015-10-13 14:29:32 -07:00

basic-bonfires.json

finished adding solutions for the Basic Bonfires

2015-10-26 19:06:48 -04:00

basic-javascript.json

Merge branch 'staging' into improve-early-challenges

2015-10-28 02:20:09 -07:00

basic-ziplines.json

The word several is repeated in step 11

2015-10-24 23:38:55 -05:00

bootstrap.json

Merge branch 'staging' into improve-early-challenges

2015-10-28 02:20:09 -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

continue improving early challenges

2015-10-26 03:14:03 -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 branch 'staging' into improve-early-challenges

2015-10-28 02:20:09 -07:00

intermediate-bonfires.json

Merge pull request #3483 from awesomeaniruddh/fix/add-test-cases-for-bonfire

2015-10-28 01:25:32 -07:00

intermediate-ziplines.json

update weather challenge with api key

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

jquery.json

Merge branch 'staging' into improve-early-challenges

2015-10-28 02:20:09 -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

Merge branch 'staging' into improve-early-challenges

2015-10-28 02:20:09 -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