Quincy Larson cf7da2a7d5 Merge branch 'staging' into js-curriculum ...

Conflicts:
	seed/challenges/basic-javascript.json

2015-07-24 16:08:45 -07:00

..

advanced-bonfires.json

finish adding the nodeschool challenges

2015-07-23 16:03:46 -07:00

angularjs.json

finish adding the nodeschool challenges

2015-07-23 16:03:46 -07:00

basejumps.json

add videos to new challenges

2015-07-23 16:03:46 -07:00

basic-bonfires.json

Quite a few spelling and grammar fixes

2015-06-30 04:28:43 +02:00

basic-javascript.json

Merge branch 'staging' into js-curriculum

2015-07-24 16:08:45 -07:00

basic-ziplines.json

update zipline copy with CodePen override warning

2015-07-23 16:03:51 -07:00

bootstrap.json

continue building the jQuery Playground

2015-07-23 15:49:03 -07:00

functional-programming.json

more minor updates

2015-07-23 15:50:47 -07:00

get-set-for-free-code-camp.json

fix broken challenges and attempt to make streak more lenient.

2015-06-29 16:32:49 -07:00

git.json

add videos to new challenges

2015-07-23 16:03:46 -07:00

hikes.json

add missing false in hikes challenge

2015-07-23 16:03:49 -07:00

html5-and-css.json

additional refactor of HTML challenges

2015-07-23 22:24:51 -07:00

intermediate-bonfires.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

intermediate-ziplines.json

finish adding the nodeschool challenges

2015-07-23 16:03:46 -07:00

jquery-ajax-and-json.json

restructure entire curriculum sequence and json files

2015-07-23 15:49:03 -07:00

mongodb.json

add videos to new challenges

2015-07-23 16:03:46 -07:00

nodejs-and-expressjs.json

finish adding the nodeschool challenges

2015-07-23 16:03:46 -07:00

object-oriented-programming.json

add videos to new challenges

2015-07-23 16:03:46 -07:00