Commit Graph

200 Commits (2c81ad568ba29ccf57ae74b3a6206343b8c26c61)

Author SHA1 Message Date
Quincy Larson 2c81ad568b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Quincy Larson 7b890aca68 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Berkeley Martinez 1606fcb24a remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
benmcmahon100 e9ca550aa3 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-08-01 00:47:39 +01:00
Quincy Larson 0e08bb8039 fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
Quincy Larson 43aa3cccba fix html view instruction column 2015-07-31 14:36:00 -07:00
Quincy Larson b75a8e3138 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
benmcmahon100 3c61c96751 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:56:11 +01:00
benmcmahon100 f759d9fc24 Merge remote-tracking branch 'origin/staging' into staging 2015-07-31 19:54:00 +01:00
benmcmahon100 a827e2c846 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:53:21 +01:00
Quincy Larson 08d2b373ac add new jquery challenges and resequence other challenges 2015-07-30 22:40:17 -07:00
Quincy Larson d2c4dd8de0 add removal and clone jquery challenges 2015-07-30 18:31:40 -07:00
Quincy Larson a592d83f02 add .remove() challenge 2015-07-30 18:12:29 -07:00
Quincy Larson 6e514a80d4 add a removeClass challenge 2015-07-30 18:05:02 -07:00
Quincy Larson 781bc3076f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 17:31:53 -07:00
Quincy Larson 3af9507f89 add two new jquery challenges 2015-07-30 17:31:47 -07:00
benmcmahon100 f49f0ccf07 Ready JavaScript Curriculum 2015-07-31 00:22:56 +01:00
Quincy Larson ebc99f6e82 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:38 -07:00
Quincy Larson 3487c8a8d6 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:31 -07:00
benmcmahon100 60dbeb07fd Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
Quincy Larson 3a22e96754 finish drafting copy and tests for bootstrap section 2015-07-30 15:45:54 -07:00
benmcmahon100 17e60ba837 Extra comma was breaking node seed 2015-07-30 21:54:33 +01:00
Quincy Larson 4e8337bfb3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 13:01:57 -07:00
Quincy Larson 86c6a9a440 fix some minor issues with bootstrap challenges 2015-07-30 13:01:46 -07:00
benmcmahon100 e78a39cb8d Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
Quincy Larson fd10044367 add container-fluid divs to all bootstrap waypoints 2015-07-30 12:20:34 -07:00
Quincy Larson a364bf989b finish color tutorial 2015-07-29 23:21:44 -07:00
Quincy Larson 262de30393 start work on RGB section 2015-07-29 00:33:17 -07:00
Quincy Larson 912e075039 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson 527df362db add ID related challenges 2015-07-28 18:51:39 -07:00
Quincy Larson d7a4f7c2c2 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Berkeley Martinez edbab55c98 Display contact information for job and size thumbnail 2015-07-26 07:57:14 -07:00
Berkeley Martinez d4ff414dc8 update jobs model and jobs seed 2015-07-25 21:59:52 -07:00
Berkeley Martinez d8110efd06 show jobs route up 2015-07-25 21:32:18 -07:00
Berkeley Martinez d6a27326a3 Fix dup id's in basic javascript 2015-07-25 20:22:13 -07:00
Quincy Larson cf7da2a7d5 Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Quincy Larson 986ce9a64c Merge branch 'js-curriculum' of github.com:FreeCodeCamp/freecodecamp into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:04:26 -07:00
Quincy Larson 84a268d09a Merge branch 'js-curriculum' of https://github.com/benmcmahon100/freecodecamp into benmcmahon100-js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 15:59:37 -07:00
Quincy Larson 1ef15eb839 additional refactor of HTML challenges 2015-07-23 22:24:51 -07:00
Quincy Larson 86532e0c0e QA first dozen html challenges 2015-07-23 18:44:16 -07:00
benmcmahon100 50f356f16f Ready Js Curriculum
Added Regex, Random Numbers and If else Challenges
2015-07-24 00:38:13 +01:00
benmcmahon100 5227fc0214 Ready JavaScript Curriculum 2015-07-24 00:35:50 +01:00
Berkeley Martinez 3046c14196 fix 'id' not _id.
fix spacing after semi colon
2015-07-23 16:14:45 -07:00
Quincy Larson 3df5319cc9 update zipline copy with CodePen override warning 2015-07-23 16:03:51 -07:00
Berkeley Martinez 860c6d8101 add missing false in hikes challenge 2015-07-23 16:03:49 -07:00
Quincy Larson 3d7ff1dd63 add transcript for missing hike 2015-07-23 16:03:49 -07:00
Berkeley Martinez 8d485a1171 fix type hike not hikes 2015-07-23 16:03:47 -07:00
Berkeley Martinez fa566e4762 add title field to challenges 2015-07-23 16:03:46 -07:00
Quincy Larson 3e413488b6 add videos to new challenges 2015-07-23 16:03:46 -07:00
Quincy Larson 636ef6d4f7 finish adding the nodeschool challenges 2015-07-23 16:03:46 -07:00