Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines ...

Conflicts:
	client/commonFramework/bindings.js

2015-12-08 01:17:03 -06:00

..

advanced-bonfires.json

Fix Misleading BF Test Messages

2015-11-29 19:46:44 -08:00

angularjs.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

automated-testing-and-debugging.json

Merge pull request #4783 from justinian336/Add/ES-translation-of-testing-and-debugging

2015-12-01 17:05:52 -08:00

basejumps.json

update user stories and sharing instructions for basejumps and ziplines

2015-12-07 00:51:37 -06:00

basic-bonfires.json

improve introductory challenges for ziplines and bonfires

2015-12-06 22:06:26 -06:00

basic-javascript.json

Fix 'test' variable name collision

2015-12-02 18:26:42 -08:00

basic-ziplines.json

update user stories and sharing instructions for basejumps and ziplines

2015-12-07 00:51:37 -06:00

bootstrap.json

Modified regex in test case for passing img tag spanning multiple lines

2015-12-06 21:08:30 -05:00

front-end-development-certificate.json

add ES translation of Front End and Full Stack Certificates

2015-11-19 10:25:21 +00:00

full-stack-development-certificate.json

update user stories and sharing instructions for basejumps and ziplines

2015-12-07 00:51:37 -06:00

gear-up-for-success.json

translation for gear up for success challenge

2015-12-04 01:31:10 -06:00

getting-started.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

git.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

hikes.json

add time estimates to challenge blocks on map

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

html5-and-css.json

fix regex to test h1 tag spanning multiple lines

2015-12-05 15:54:43 -05:00

intermediate-bonfires.json

fix indent intermediate-bonfires.json

2015-12-05 15:15:44 +09:00

intermediate-ziplines.json

update user stories and sharing instructions for basejumps and ziplines

2015-12-07 00:51:37 -06:00

jquery.json

Updated text from "jQuery Funhouse" to "jQuery Playground"

2015-12-06 16:49:18 -03:00

json-apis-and-ajax.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

mongodb.json

add ES translation of MongoDB Waypoint

2015-11-15 12:26:21 +00:00

nodejs-and-expressjs.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

object-oriented-and-functional-programming.json

Minor improvements to spanish translation

2015-12-03 19:02:34 -05:00

upper-intermediate-bonfires.json

Merge pull request #5006 from vtamara/fix/translation-minor-spanish

2015-12-05 00:02:30 -06:00