Commit Graph

5816 Commits

Author SHA1 Message Date
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
fa8674c588 Fix Bootstrap Waypoints Wording Clarifications
Closes #3895 and #3893
2015-10-27 19:30:47 -07:00
37b5784899 Fixed typos in assert messages 2015-10-27 20:57:48 -04:00
63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
ee69ff4314 Merge pull request #3885 from tdugger/fix/3884
The word several is repeated in step 11
2015-10-27 17:29:38 -07:00
17310b0a98 Merge pull request #3936 from XianPalin/fix/incorrect_text_objective_2
Fix example for black background color in Objective 2
2015-10-27 17:28:22 -07:00
f423bbf4ea Fix example for black background color closes #3870 2015-10-27 12:28:15 -04:00
ae2be7234b Merge pull request #3920 from CodeNonprofit/new-nonprofits
Added nonprofits and changed status of several ongoing projects to "started"
2015-10-27 14:37:58 +00:00
096d0099c5 Merge pull request #3922 from krantzinator/feature/add-basic-bonfire-solutions
finished adding solutions for the Basic Bonfires
2015-10-27 14:24:09 +00:00
9f901ec97a Merge pull request #3926 from Em01/ew/fix-typo-boolean-waypoint-3897
Fixed typos in in JS Waypoints 2, 4 and 23.
2015-10-27 14:20:10 +00:00
daeaf34372 Fixed same issue in waypoint 4 2015-10-27 14:06:34 +00:00
72c52114f6 Fixed additional typos. 2015-10-27 09:49:56 +00:00
218f44e40b Fixed typos in in JS Waypoints. Closes #3897 2015-10-26 23:59:43 +00:00
2852b5a196 Merge pull request #3924 from Chiouonthis/patch-1
Update README.md
2015-10-26 16:31:41 -07:00
5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
cd430a5167 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
ae4011766b Update nonprofits.json 2015-10-26 16:44:06 -04:00