Commit Graph

5832 Commits

Author SHA1 Message Date
086b0bb60c JSON/API Lesson Cleanup
+ Fixes Convert JSON to HTML lesson (Closes #4016)
+ Add Formatting to Geolocation lesson output (Closes #4010)
+ Fixes Render Images lesson
+ Removes unnecessary `?callback=` from JSON challenges. (Closes #3972)
+ Lots of other formatting and consistancy changes.
+ Also closes #3962 and closes #3969
2015-10-30 12:10:45 -07:00
e7b416cd32 Merge pull request #4017 from ltegman/fix/nest-anchor-in-paragraph-test-4012
Fix Nest Anchor in Paragraph Test
2015-10-30 21:25:36 +04:00
69c51393d2 Merge pull request #3986 from MartinDelille/patch-1
fix typo and add comma
2015-10-30 20:56:58 +04:00
ad5783ae6d Merge pull request #4029 from bencassidy/fix/typo
Fix for typo in instructions
2015-10-30 20:38:14 +04:00
fb0e78fc3a fixed typer 2015-10-30 09:30:08 -07:00
6ef376a621 fix typo and add comma
latitiude => latitude
add space and <br>
2015-10-30 16:28:34 +01:00
86db9ee7ea Merge pull request #4025 from avastu/fix/remove-chai-js
Removed Chai.js mention from Bonfire
2015-10-30 07:54:07 -07:00
21014c2b11 Removed Chai.js mention from Bonfire 2015-10-30 02:25:19 -07:00
c3bcc9fbc8 Fix Nest Anchor in Paragraph Test
Closes #4012 and closes #3989
2015-10-29 20:05:48 -07:00
e685489bcb Merge pull request #3990 from abhisekp/fix/waypoint-for-loop
Instructional clarification for Waypoint - Iterate with JavaScript For Loops
2015-10-29 15:48:06 -07:00
f7d7e538a2 Merge pull request #4008 from ltegman/fix/object-waypoint-lesson-typos-3993-3994
Fix Object Waypoints Typos
2015-10-29 15:36:44 -07:00
5c714efa4e for loop clarification
- fix typo - variable
- Instruction clarification
- Example clarification
2015-10-30 04:06:35 +05:30
0c3b6717ef Merge pull request #4006 from benmcmahon100/staging
Part two of post deploy challenge hotifx
2015-10-29 15:35:22 -07:00
1d3b842c98 Merge pull request #4007 from SaintPeter/fix/json-filter
Fix for JSON Prefilter issue
2015-10-29 15:23:37 -07:00
5eb71b993f Fix Object Waypoints Typos
Closes 3993 and closes 3994 and fixes some other typos
2015-10-29 14:48:55 -07:00
709ce63e75 Fixes 4003 2015-10-29 14:34:00 -07:00
208f9bfd84 Part two of post deploy challenge hotfix 2015-10-29 21:22:02 +00:00
ce0db11125 Merge pull request #5 from FreeCodeCamp/staging
sync
2015-10-29 21:21:27 +00:00
436770c0a7 Merge pull request #4005 from benmcmahon100/master
AJAX and JSON Post-release Hotfix
2015-10-29 14:12:09 -07:00
bd1eb104ac Update json-apis-and-ajax.json 2015-10-29 21:07:51 +00:00
c03d715057 Merge pull request #4 from FreeCodeCamp/master
Master
2015-10-29 21:07:14 +00:00
4a8eabf98f Merge pull request #3 from FreeCodeCamp/master
Master
2015-10-29 21:06:39 +00:00
5ff865c5c3 Merge pull request #3998 from FreeCodeCamp/nonprofit-json-patch
Rehost images to imgur & fixed error on TAADAS
2015-10-29 11:28:18 -07:00
117c556fab Rehost images to imgur & fixed error on TAADAS 2015-10-29 14:25:14 -04:00
6061c6376c Merge pull request #3978 from AryanJ-NYC/fix/js-introduced-this
Allude to 'this' keyword as suggested by @ParkinT
2015-10-28 23:16:24 -07:00
71435e6b7e Allude to 'this' keyword as suggested by @ParkinT
@ParkinT suggested the ```this``` keyword be alluded to in the lesson.
Closes #3899
2015-10-28 23:55:38 -04:00
b2dbe08f7e Merge pull request #3970 from ltegman/fix/waypoint-count-backwards-seed-typo-3968
Fix Waypoint Count Backwards Seed Code
2015-10-29 07:06:22 +08:00
9d668c30af Fix Waypoint Count Backwards Seed Code
Closes #3968
2015-10-28 15:18:20 -07:00
cdc040d67a Merge pull request #3967 from ltegman/fix/waypoint-delete-properties-test-3960
Fix Waypoint Delete Properties From an Object Tests
2015-10-28 15:01:13 -07:00
57dd1ba904 Fix Waypoint Delete Properties From an Object Tests
Closes #3960
2015-10-28 14:33:26 -07:00
5c1f99ae2f Merge pull request #3964 from FreeCodeCamp/post-deploy-hotfixes
Post deploy hotfixes
2015-10-28 14:15:10 -07:00
c82a36618f fix typos in gear-up-for-success section 2015-10-28 14:00:45 -07:00
ef3e910251 remove mdn links from oop fp challenges 2015-10-28 13:49:38 -07:00
6613ed95cf Merge pull request #3910 from FreeCodeCamp/clementine
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
fb4451722e Fix typos 2015-10-28 12:24:46 -07:00
d3c9e6e278 Merge pull request #3959 from FreeCodeCamp/improve-early-challenges
Improve early challenges
2015-10-28 12:08:20 -07:00
50cfda07ee Fix oop/fp challenges 2015-10-28 12:03:31 -07:00
b5f5025df2 Fix map iteration and object update copy. 2015-10-28 10:43:45 -07:00
de7657bbea Fix update properties challenge 2015-10-28 10:35:01 -07:00
21fd983bb0 one more commit before resuming on Berkeley side 2015-10-28 10:11:46 -07:00
d2ce2275b3 everything is ready except OOP 2015-10-28 05:13:49 -07:00
44c77d65b1 fix some mis-mergings for basic-javascript.json 2015-10-28 02:39:51 -07:00
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
74e4b21ec6 Merge pull request #3909 from ltegman/fix/waypoint-slot-machine-permits-more-efficient-answer-2278
Fix Waypoint Create Slot Machine Tests
2015-10-28 01:49:39 -07:00
4ad65513cc Merge pull request #3483 from awesomeaniruddh/fix/add-test-cases-for-bonfire
Add tests to intermediate bonfire
2015-10-28 01:25:32 -07:00
eb0a1bea01 Merge pull request #3946 from ltegman/fix/bootstrap-waypoint-wording-3895-3893
Fix Bootstrap Waypoints Wording Clarifications
2015-10-28 01:20:06 -07:00
7f5653963b finish JavaScript and OOP sections for QA 2015-10-28 01:15:54 -07:00
6c3319321a major improvements to basic-javascript.json 2015-10-27 23:16:08 -07:00
dd3893145d finish first pass of jQuery 2015-10-27 21:02:08 -07:00
6936d35c5d Merge pull request #3944 from mschultz4/fix/typos-intermediate-bonfire
Fixed typos in assert messages
2015-10-27 19:36:39 -07:00