Commit Graph

29555 Commits

Author SHA1 Message Date
Ben McMahon
c03d715057 Merge pull request #4 from FreeCodeCamp/master
Master
2015-10-29 21:07:14 +00:00
Ben McMahon
4a8eabf98f Merge pull request #3 from FreeCodeCamp/master
Master
2015-10-29 21:06:39 +00:00
Quincy Larson
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
Michael D. Johnson
bf7fb1d0cb Rehost images to imgur & fixed error on TAADAS 2015-10-29 14:25:14 -04:00
Michael D. Johnson
117c556fab Rehost images to imgur & fixed error on TAADAS 2015-10-29 14:25:14 -04:00
Logan Tegman
7fd5174fe0 Fix Ctrl-Enter doesn't work when not logged in.
Closes #3900

First time contributing real code, so please let me know any critiques or style changes I should make.
2015-10-29 00:13:20 -07:00
Logan Tegman
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
Aryan Jabbari
4b258f5b21 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
Aryan Jabbari
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
Aniruddh Agarwal
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
Logan Tegman
a4e4df1a55 Fix Waypoint Count Backwards Seed Code
Closes #3968
2015-10-28 15:18:20 -07:00
Logan Tegman
9d668c30af Fix Waypoint Count Backwards Seed Code
Closes #3968
2015-10-28 15:18:20 -07:00
Berkeley Martinez
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
Logan Tegman
83c3fa6ae4 Fix Waypoint Delete Properties From an Object Tests
Closes #3960
2015-10-28 14:33:26 -07:00
Logan Tegman
57dd1ba904 Fix Waypoint Delete Properties From an Object Tests
Closes #3960
2015-10-28 14:33:26 -07:00
Berkeley Martinez
5c1f99ae2f Merge pull request #3964 from FreeCodeCamp/post-deploy-hotfixes
Post deploy hotfixes
2015-10-28 14:15:10 -07:00
Quincy Larson
86f3069da4 fix typos in gear-up-for-success section 2015-10-28 14:00:45 -07:00
Quincy Larson
c82a36618f fix typos in gear-up-for-success section 2015-10-28 14:00:45 -07:00
Quincy Larson
a770335cd9 remove mdn links from oop fp challenges 2015-10-28 13:49:38 -07:00
Quincy Larson
ef3e910251 remove mdn links from oop fp challenges 2015-10-28 13:49:38 -07:00
Berkeley Martinez
6613ed95cf Merge pull request #3910 from FreeCodeCamp/clementine
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
Berkeley Martinez
9ef1af5664 Merge pull request #3910 from FreeCodeCamp/clementine
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
Berkeley Martinez
fb4451722e Fix typos 2015-10-28 12:24:46 -07:00
Berkeley Martinez
1bc56e8d0e Fix typos 2015-10-28 12:24:46 -07:00
Quincy Larson
d3c9e6e278 Merge pull request #3959 from FreeCodeCamp/improve-early-challenges
Improve early challenges
2015-10-28 12:08:20 -07:00
Berkeley Martinez
2ed01e920b Fix oop/fp challenges 2015-10-28 12:03:31 -07:00
Berkeley Martinez
50cfda07ee Fix oop/fp challenges 2015-10-28 12:03:31 -07:00
Berkeley Martinez
35e8efb06d Fix map iteration and object update copy. 2015-10-28 10:43:45 -07:00
Berkeley Martinez
b5f5025df2 Fix map iteration and object update copy. 2015-10-28 10:43:45 -07:00
Berkeley Martinez
b390db0be4 Fix update properties challenge 2015-10-28 10:35:01 -07:00
Berkeley Martinez
de7657bbea Fix update properties challenge 2015-10-28 10:35:01 -07:00
Quincy Larson
515a011448 one more commit before resuming on Berkeley side 2015-10-28 10:11:46 -07:00
Quincy Larson
21fd983bb0 one more commit before resuming on Berkeley side 2015-10-28 10:11:46 -07:00
Quincy Larson
4820ae2e36 everything is ready except OOP 2015-10-28 05:13:49 -07:00
Quincy Larson
d2ce2275b3 everything is ready except OOP 2015-10-28 05:13:49 -07:00
Quincy Larson
6a7d9e2878 fix some mis-mergings for basic-javascript.json 2015-10-28 02:39:51 -07:00
Quincy Larson
44c77d65b1 fix some mis-mergings for basic-javascript.json 2015-10-28 02:39:51 -07:00
Quincy Larson
7326996bdb 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
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
Quincy Larson
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
Quincy Larson
4011efdaed 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
Quincy Larson
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
Quincy Larson
bcc730cbee 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
Quincy Larson
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
Quincy Larson
42cb25ca2a 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
Quincy Larson
eef1c5136a finish JavaScript and OOP sections for QA 2015-10-28 01:15:54 -07:00
Quincy Larson
7f5653963b finish JavaScript and OOP sections for QA 2015-10-28 01:15:54 -07:00
Quincy Larson
419f6507d0 major improvements to basic-javascript.json 2015-10-27 23:16:08 -07:00
Quincy Larson
6c3319321a major improvements to basic-javascript.json 2015-10-27 23:16:08 -07:00
Quincy Larson
1344283221 finish first pass of jQuery 2015-10-27 21:02:08 -07:00