Commit Graph

247 Commits (a7ba4bacf87e7b32166ab8c43ed4bc274a99e0b8)

Author SHA1 Message Date
benmcmahon100 e944889f69 Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Quincy Larson 1de4de80eb quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson 5a4560c0fb Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100 1c2791ea07 Merge remote-tracking branch 'origin/staging' into staging 2015-08-04 00:53:34 +01:00
benmcmahon100 7dcfdeaeee fix https://github.com/FreeCodeCamp/freecodecamp/issues/1450 missing semi-colon and assert( 2015-08-04 00:53:20 +01:00
Berkeley Martinez 309b97a527 Merge pull request #1231 from ahstro/lumenteun-410
Improved consitency in 'Friendly Date Ranges' test cases.
2015-08-03 16:04:37 -07:00
Berkeley Martinez b2912198ba Merge pull request #1197 from 1hella/1hella-1156
Fix typos in Bonfire: Friendly Date Ranges #1156
2015-08-03 16:02:50 -07:00
Djordje Lacmanović 84ff621576 fixed a typo as per issue 1473 2015-08-04 00:39:11 +02:00
benmcmahon100 de124a4f81 Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00
benmcmahon100 6fd7e7663c Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework 2015-08-03 18:02:26 +01:00
benmcmahon100 f7e842ca78 Hardened The check-the-length-property-of-a-string-variable challenge to make it hard to get no tests run 2015-08-03 17:01:27 +01:00
benmcmahon100 84c8eecd3b Fixed route on waypoint-label-bootstrap-wells and the tests. Fixed the test messages on waypoint-give-each-element-a-unique-id 2015-08-03 16:42:26 +01:00
Quincy Larson 2f74b3f795 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-02 19:06:32 -07:00
Quincy Larson e5fe98b1bb fix minor grammar issue in javascript challenges 2015-08-02 19:06:25 -07:00
benmcmahon100 10156ea245 Two of the tests were inverted 2015-08-02 22:09:36 +01:00
benmcmahon100 5bfd381e65 Allows users to add values to the inner arrays 2015-08-02 21:24:13 +01:00
benmcmahon100 df6465da3e Fixed the fact it was myDecimal instead of myFloat 2015-08-02 21:15:39 +01:00
LumenTeun 735ed1c3ec 'Create a Text Field' now makes sure the input type is text. #1241 2015-08-01 17:07:03 -07:00
Berkeley Martinez 6c3e863900 Merge branch 'staging' of https://github.com/amorphid/freecodecamp into amorphid-staging 2015-08-01 16:47:26 -07:00
Jose M Viloria f8b5efefbb Typo in Waypoint #38
Deleted extra semicolon.
2015-08-01 16:39:38 -07:00
Berkeley Martinez b4cc9f2fd9 Merge branch 'Sazumo-1248' of https://github.com/Sazumo/freecodecamp into Sazumo-Sazumo-1248 2015-08-01 16:12:08 -07:00
Quincy Larson 5c97ab9eed add help room to chat room challenge, thanks to SaintPeter's suggestion 2015-08-01 12:36:42 -07:00
Quincy Larson b3b5f05e85 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 12:16:14 -07:00
Quincy Larson f5c2ed6158 implement ckylee additional test to everything be true bonfire #1397 2015-08-01 12:14:25 -07:00
Quincy Larson 235f2b0e11 Merge pull request #1399 from biellls/patch-1
Change order of subarrays to cover all cases
2015-08-01 11:53:47 -07:00
Quincy Larson d62368f96a fixed tcyrus broken pull request and also extend its methodology to another challenge 2015-08-01 11:45:59 -07:00
Quincy Larson cba30f9114 Merge branch 'staging' of https://github.com/tcyrus/freecodecamp into tcyrus-staging 2015-08-01 11:30:22 -07:00
Quincy Larson bb375b2a10 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 11:29:54 -07:00
Quincy Larson d0a43508cc Merge pull request #1432 from SaintPeter/sorted_union_bonfire
Added additional tests to Sorted Union Bonfire
2015-08-01 11:27:45 -07:00
benmcmahon100 4e7c681d90 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
benmcmahon100 fdd16820ef Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
Quincy Larson 8bc67b3adf Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 08:26:07 -07:00
Quincy Larson b6a8725994 fix some issues and finalize jquery challenges for today 2015-08-01 08:25:56 -07:00
benmcmahon100 d4fc4cc8c3 All done without extra regex 2015-08-01 16:11:57 +01:00
benmcmahon100 0f4d8b5c65 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 16:10:58 +01:00
benmcmahon100 8225ce3cdb All done without the extra regex 2015-08-01 16:10:21 +01:00
Quincy Larson af6209f729 add two more jquery challenges 2015-08-01 07:11:11 -07:00
Quincy Larson d49cf387db remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
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
SaintPeter 69c96496ec Added additional tests to Sorted Union Bonfire 2015-07-31 18:04:06 -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
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
TCYRUS 7df555a2ff Fix Issue #1015
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
biellls 41f643b5df Change order of subarrays to cover all cases
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02: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 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
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
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
Quincy Larson b8fd1181a2 update basejump demo urls 2015-07-23 16:03:46 -07:00
Quincy Larson 080e90f446 finish scripts and overall structure for new curriculum 2015-07-23 16:03:46 -07:00
Quincy Larson 2e90976427 more minor updates 2015-07-23 15:50:47 -07:00
Quincy Larson ebfb8384b0 update hikes.json 2015-07-23 15:50:47 -07:00
Quincy Larson 003aa90f8b add hikes.json 2015-07-23 15:49:04 -07:00
Quincy Larson 260797affd mid-task commit for Berkeley to take over 2015-07-23 15:49:04 -07:00
Quincy Larson 359d63a6bd continue building the jQuery Playground 2015-07-23 15:49:03 -07:00
Quincy Larson bbe9e492cd start building the jquery playground bootstrap.json flow 2015-07-23 15:49:03 -07:00
Quincy Larson 1cc82ab469 restructure entire curriculum sequence and json files 2015-07-23 15:49:03 -07:00
Quincy Larson 7fc3664a41 continue adding rgb challenges to basic-html5 2015-07-23 15:49:02 -07:00
benmcmahon100 a2bae52c65 Added start of the random number challenges 2015-07-16 11:06:04 +01:00
benmcmahon100 79938d0fc1 Full JS Stuff
There is a bit more RegEx and if else stuff. Other challenges can be added later but this is the base working set without @QuincyLarson 's fixes to the copy
2015-07-13 21:55:36 +01:00
Sean Nguyen da9637297b Add <p> element to label the new ordered list.
- Improve consistency of challenge seeds
- Clarify challenge objective for "Waypoint: Created an ordered list"
2015-07-13 13:20:28 -07:00
benmcmahon100 90f7e33f42 almost complete js challenges 2015-07-13 00:48:58 +01:00
Michael Pope f606d49a68 Clarify text for 'Waypoint: Add a Negative Margin to an Element'
- the user was asked to change text to a negative number
- this was confusing, as the test only passes if the value ia -15px
2015-07-11 10:52:58 -04:00
benmcmahon100 4060d7fdc9 Update to 30! 2015-07-10 17:22:58 +01:00
benmcmahon100 35fff3ed57 Third commit to the new curriculum 2015-07-10 00:56:30 +01:00