Commit Graph

2223 Commits (524eae210beaddfa5e641a96666960bbf10584fd)

Author SHA1 Message Date
Quincy Larson 2c6b1e9312 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson 6ba77ca9f6 update curriculum structure again 2015-08-09 21:26:26 -07:00
Shouvik Roy 30b913b2d8 Update basic-javascript.json to fix #1642
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
2015-08-10 07:32:57 +05:30
Quincy Larson 7ce1a06c54 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Isabell Long 2f714f1541 Fix typos in the Basic Javascript challenge
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
2015-08-09 19:32:10 +00:00
Berkeley Martinez 4fae8d59b3 fix mising type
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
ahstro ce6f0b4a61 Incorrect JSON caused error during seed 2015-08-10 20:11:59 +02:00
alanmbarr 8a003d1c6a other typo
text input instead of area for clarity
2015-08-08 22:10:07 -07:00
alanmbarr d3bbed92ed Update bootstrap.json 2015-08-08 21:59:03 -07:00
ahstro e262b5d6bf Disregard order in 'Symmetric Difference' #1402 2015-08-09 02:08:44 +02:00
Quincy Larson 26a616b2d0 start onboarding page 2015-08-08 16:13:23 -07:00
benmcmahon100 af5633bf6b Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-08 17:21:13 +01:00
benmcmahon100 5e9a9d07fb Update to include OOP & functional programming course layout 2015-08-08 17:11:11 +01:00
Berkeley Martinez 24e45d18ce add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez d31b53da2a rename top level `title` to name 2015-08-07 18:43:45 -07:00
ahstro 7c3740ddc8 Added even more HTML entities and removed ' 2015-08-08 03:43:14 +02:00
ahstro 9966f49678 'Convert HTML Entities' now allows upper and lower case entities #1647 2015-08-08 03:29:23 +02:00
ahstro 75919c63f3 Everything is horrible 2015-08-08 02:38:16 +02:00
Berkeley Martinez d75348ab22 Merge pull request #1637 from Greenheart/staging
fixed small typo
2015-08-07 09:01:44 -07:00
Shouvik Roy 9ed9afc86c Fix for #1644
Change challenge description of "Bonfire: Where art thou", to fix issue #1644. Changed description to say "an array" instead of "a list" to make it clear and less confusing.
2015-08-07 21:04:20 +05:30
Samuel Plumppu 83005129cb clarified description for waypoint: make images mobile responsive 2015-08-07 17:03:29 +02:00
Samuel Plumppu d4359243d4 fixed small typo 2015-08-07 14:53:24 +02:00
Quincy Larson dff5b181e1 revamp onboarding challenges to reflect changes to curriculum and wiki 2015-08-07 00:18:30 -07:00
Quincy Larson 9f926c8f08 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson aa58671ee3 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu 85026d558e fixed tests to check for lowercase hexadecimal colors 2015-08-07 02:13:11 +02:00
ahstro 7e5ddb102c Wrong element in jQuery targeting waypoint 2015-08-06 22:41:49 +02:00
Samuel Plumppu f9498f8e86 updated instructions for waypoint: get set for ziplines to fit with new Codepen UI 2015-08-06 22:30:46 +02:00
ahstro e0f1342a00 Grammatical error in 'Use Hex Code for Specific Colors' 2015-08-06 22:27:16 +02:00
ahstro 260b4b2bb7 Updated test case comment in 'fluid containers' 2015-08-06 22:23:00 +02:00
ahstro 962ee6d7d5 Changed test order & added <code> in 'img to link' 2015-08-06 22:07:54 +02:00
Samuel Plumppu e9ad1bad8d fixed typos 2015-08-06 21:31:24 +02:00
Samuel Plumppu 0624b65292 fixed typos 2015-08-06 20:45:59 +02:00
Dealga McArdle 1874e517f7 sputkin -> sputnik 2015-08-06 16:02:20 +02:00
benmcmahon100 7284bbf7a7 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100 a82265e883 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson afa352169d fix some issues that were breaking seed task 2015-08-06 02:27:56 -07:00
Quincy Larson 73ab630e0b update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson ac44b5b481 rename all of Ben's JavaScript challenges to be more in line with other waypoints 2015-08-06 02:06:53 -07:00
Quincy Larson 542f35ab93 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 01:44:37 -07:00
Quincy Larson f94e3b896e add simon zipline 2015-08-06 01:44:31 -07:00
Berkeley Martinez 475623efa5 Merge pull request #1594 from martinkwan/patch-1
Updated Roman Numeral Challenge link
2015-08-06 00:58:24 -07:00
Berkeley Martinez 1c0874bcd6 Merge pull request #1595 from flota113/flota113-1585
Fixed a few typos in javascript-basic
2015-08-06 00:57:56 -07:00
Berkeley Martinez e0841b7b2d Merge pull request #1592 from cristianvnica/cristianvnica-1488
Fixing issue #1488
2015-08-06 00:57:06 -07:00
Marcin Flotyński d90bb6a4f4 Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
Martin Kwan 01b157f90a Updated Roman Numeral Challenge link
Updated link so it would open in a new tab instead of the current tab.
2015-08-06 00:02:15 -07:00
Cristian V. Nica 528efe32c8 Fixing issue #1488
Correcting small mistakes in the waypoint instruction.
2015-08-06 09:30:13 +03:00
benmcmahon100 171fdb32c5 Merge pull request #1584 from flota113/flota113-1579
Fixed tests in Waypoint: Use Comments to Clarify Code
2015-08-06 00:21:59 +01:00
Marcin Flotyński 372b83d4f5 Fixed tests
Added check if the object isn't null and escaped quotes because text
enclosed apostrophe
2015-08-06 00:57:55 +02:00
Marcin Flotyński 5bd6c6dc3f changed to agree with the style -
greater than 0 instead of greater than or eqal to 1
2015-08-06 00:25:11 +02:00
Marcin Flotyński 16add147e4 first fixes - length larger _or equal_ to 1
I'm not sure if the tests are too vague - they allow to comment out way
more than just the text specified - like the whole page..
2015-08-06 00:20:52 +02:00
Marcin Flotyński 55dd99067d Fixed tests in waypoint
changes col-xs-12 to col-xs-6 so the tests works
Issue #1578
2015-08-05 23:53:45 +02:00
Rafael J. Rodriguez cb929cdba9 Fix for Issue #1540 2015-08-05 17:34:06 -04:00
benmcmahon100 59991365f5 Merge pull request #1576 from cristianvnica/cristianvnica-1575
Fixing #1575
2015-08-05 21:24:05 +01:00
Cristian V. Nica 241147a5c8 Fixing #1575
Fixing small typo
2015-08-05 23:22:37 +03:00
benmcmahon100 42c9f44a3c Merge pull request #1573 from Greenheart/staging
added test for object for steamroller bonfire
2015-08-05 21:22:12 +01:00
benmcmahon100 585ef7db12 Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
Samuel Plumppu 2978380876 added test for object for steamroller bonfire 2015-08-05 21:37:04 +02:00
Quincy Larson 0254a9bd57 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson 40c371238d new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica 367bcdf35c Trying to fix: #1571
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
benmcmahon100 a784d9e960 Changed the object lessons to use dot notation instead of bracket
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
benmcmahon100 b6dc52cf08 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100 50cc75fc41 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 15:39:18 +01:00
benmcmahon100 92091cea96 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson d838036ed2 add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
Quincy Larson 78234c556b update cats to fetch from s3 2015-08-04 23:31:00 -07:00
Quincy Larson 8c44f1a661 continue working on jquery challenges 2015-08-04 23:24:26 -07:00
Berkeley Martinez 6f53263849 Merge pull request #1508 from flota113/flota113-1502
Small Fix of Bootstrap waypoint challenge - Issue 1502
2015-08-04 12:35:08 -07:00
Berkeley Martinez 3cf1496e4a Merge pull request #1517 from ngalluzzo/fix-class-typo
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
Ben 5d370c87b0 Update bootstrap.json
fixed typo (misspelled 'container')
2015-08-04 14:03:19 -05:00
Nic Galluzzo c8b712f73c Update bootstrap.json 2015-08-04 08:54:21 -07:00
Djordje Lacmanović 04074fcade fixed issue #1511 - now checking for words longer than 9 chars
closes #1511
2015-08-04 16:51:10 +02:00
Marcin Flotyński 0971cf2947 Small Fix of Bootstrap waypoint challenge - Issue 1502
Changed second check for second class - 'btn-default'
2015-08-04 15:00:22 +02:00
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
benmcmahon100 b117341e72 Update 2 of the new js curriculum!
7 more challenges added!
2015-07-09 00:26:16 +01:00
LumenTeun 8cbf6d224c Improved consitency in 'Friendly Date Ranges' test cases. #410 2015-07-08 21:19:34 +02:00
benmcmahon100 c569d6dfdb Final wording tweak to line 1803 2015-07-08 19:51:19 +01:00
benmcmahon100 66bbf1ca92 Updated to reflect original wording a bit better
Another slight tweak to line 1803 to make it more true to the original wording of the challenge
2015-07-08 19:45:27 +01:00
benmcmahon100 fa8af8ae05 Fix for #1218 2015-07-06 23:46:26 +01:00
Quincy Larson aa6a96a4fd add basic javascript.json 2015-07-05 17:12:52 -07:00
Quincy Larson 7d2029780e clear basic-javascript.json 2015-07-05 17:03:41 -07:00
Stephen Wanhella 7231a68222 Fixed typos in Bonfire: Friendly Date Ranges #1156 2015-07-04 16:04:12 -07:00
Quincy Larson f8692cd60c start purging the br challenges 2015-07-03 01:08:11 -07:00
Quincy Larson 25c5bd769a add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson ec642a0980 Merge pull request #1159 from LumenTeun/lumenteun-1151
'Font degrade'-test now check order of font-familiy.
2015-07-02 13:57:41 -07:00
Quincy Larson 087e6fac21 Merge pull request #1160 from LumenTeun/lumenteun-1158
Slightly clarifies 'Uncomment HTML'.
2015-07-02 13:56:48 -07:00
Quincy Larson afef9bc252 Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
Quincy Larson f126d0bc01 Merge pull request #1163 from kmiasko/staging
Waypoint: Get Set for Basejumps changed deprecated heroku command
@kmiasko Thanks for fixing this!
2015-07-02 13:51:23 -07:00
Quincy Larson 8a0c9eef54 Merge pull request #1172 from LumenTeun/lumenteun-1168
Reword parts of 'how-to-npm'-waypoint.
2015-07-02 13:50:22 -07:00
benmcmahon100 d4e013a846 Update basic-html5-and-css.json 2015-07-01 15:28:29 +01:00
benmcmahon100 4d1db79935 solution to issue #1173
this solution may also be needed for some of the other css-based challenges
2015-07-01 15:16:44 +01:00
LumenTeun d7e1c0afef Reword parts of 'how-to-npm'-waypoint. #1168 2015-07-01 13:46:36 +02:00
Quincy Larson 08fad55642 more improvements to html.json 2015-06-30 23:21:34 -07:00
Quincy Larson 2059b24f5d finish the color section of the basic html section 2015-06-30 20:10:00 -07:00
Quincy Larson 6682839263 finish the color priority section of basic-html 2015-06-30 18:17:20 -07:00
Krzysztof Miąsko d593463e63 Waypoint: Get Set for Basejumps changed deprecated heroku command 2015-06-30 12:25:51 +02:00
LumenTeun 5316b7ac07 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson 5c39f8c29e half way done creating css priority challenges 2015-06-29 19:17:06 -07:00
LumenTeun 1a80870665 Slightly clarifies 'Uncomment HTML'. Regarding #1158 2015-06-30 03:17:12 +02:00
LumenTeun 86356659b3 'Font degrade'-test now check order of font-familiy. Fixes #1151 2015-06-30 02:52:21 +02:00
Quincy Larson bee2a843d1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson b96630b9e1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
Quincy Larson 7bb72a824b make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
Quincy Larson 24e1cc8859 Merge pull request #1115 from NatashaHaggard/923
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
Quincy Larson baa0e68e52 Merge pull request #1124 from greasan/greasan-translateDE
First two sections translated into German
2015-06-28 15:22:58 -07:00
Quincy Larson 0ea78b9d1f Merge pull request #1114 from NatashaHaggard/1059
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
Quincy Larson c3826c39dd Merge pull request #1074 from SaintPeter/staging
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
Quincy Larson cd29353ac0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
Quincy Larson a1055b0e52 clean up future jquery challenges 2015-06-27 11:56:31 -07:00
greasan 6a0996b1e0 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
Quincy Larson b287c14ddd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Quincy Larson 30c46a43eb update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Natasha Haggard e24144edaa Issue 923 - Grammatical error
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."

Removed the "and" after "his or her".

This closes #923
2015-06-24 22:40:10 -05:00
Natasha Haggard 45787cebbd Issue 1059 - Wording issue on instructions
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".

This closes #1059
2015-06-24 21:52:10 -05:00
Berkeley Martinez 16edbe765a Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
Berkeley Martinez 39f46b380d Merge pull request #1102 from NatashaHaggard/patch-2
Issue 1080
2015-06-24 10:32:58 -07:00
LumenTeun 6b423dfcb1 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
Quincy Larson 9442f5f648 Merge branch 'master' into staging
Conflicts:
	controllers/resources.js
	public/js/main_0.0.2.js
	seed/challenges/advanced-bonfires.json
	seed/challenges/basic-bonfires.json
	seed/challenges/get-set-for-free-code-camp.json
	server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
Natasha Haggard 12f05fecc9 Issue 1080
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
Rex Schrader 33af133af3 Add Symmetric Difference link to bonfire 2015-06-22 21:49:44 -07:00
Natasha Haggard 4fee40eb8e Issue 1036 - Fixed minor grammatical mistake
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
2015-06-22 22:13:21 -05:00
Matias Cao 120879e10b WP 12-13 ES Translation 2015-06-22 20:22:09 -03:00
terakilobyte 99ba9aeb4d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-22 10:31:24 -04:00
terakilobyte 96c3e41941 Fixes #1053
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
2015-06-22 10:30:26 -04:00
greasan e3eb642fa8 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-21 12:25:45 +02:00
brandenbyers 198ce39564 Change eqls to equal 2015-06-21 00:56:20 -05:00
Quincy Larson 31686e8250 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson 3f21574b5e add new chat challenge 2015-06-20 18:12:12 -07:00
greasan 3a5574c805 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-20 10:46:50 +02:00
Quincy Larson a6ca40d6f3 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson c01a0ad9d7 fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
Quincy Larson fe9d1e97bb fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Quincy Larson 1bb9951d04 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
Quincy Larson 21de53de04 Merge pull request #961 from LumenTeun/lumenteun-942
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
Quincy Larson d23ad5c121 Merge pull request #960 from 1hella/1hella-959
1hella 959
2015-06-19 17:31:14 -07:00
Quincy Larson b857d19e2c Merge pull request #958 from LumenTeun/lumenteun-941
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
Quincy Larson db1233c7d4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson 0e9ab5017b Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
	server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
Quincy Larson 00d1f00b72 Merge pull request #940 from LumenTeun/lumenteun-907
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
Quincy Larson a516a49e15 Merge pull request #939 from LumenTeun/lumenteun-911
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
Quincy Larson 37341a2ad3 Merge pull request #938 from LumenTeun/lumenteun-914
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
Quincy Larson 7a431bef5b Merge pull request #937 from LumenTeun/lumenteun-918
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
Quincy Larson 2cb57d5fcc Merge pull request #936 from LumenTeun/lumenteun-924
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -07:00
Berkeley Martinez f248b3fb9f fix name and dashed name switched
close #975
2015-06-18 20:02:32 -07:00
Stephen Wanhella 78fa5449b4 Added new test with different max number to Bonfire: Truncate a String
Issue 959
2015-06-18 17:48:30 -07:00
Brett Guillory 92656fcf2f Added missing MDN Link
This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
2015-06-18 17:48:30 -07:00
Brett Guillory 07a54c9e0c Fixed a word 2015-06-18 17:48:29 -07:00
LumenTeun cddc1b6c6a More test cases for 'Seek and Destroy' #942 2015-06-18 11:56:13 +02:00
LumenTeun f04019a790 'No repeats please' test fix. #941 2015-06-17 23:30:08 +02:00
Quincy Larson 931a197a93 fix minor typo in html challenge 2015-06-16 18:00:17 -07:00
Matias Cao 3ce51fecea WP11 ES Translation 2015-06-16 18:27:58 -03:00
greasan 026e027f23 Translated basic HTML5 and CSS 2015-06-16 19:40:07 +02:00
greasan e39764a739 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-16 19:20:27 +02:00
terakilobyte bec1460d82 Fix wikipedia viewer zipline naming 2015-06-16 08:36:54 -04:00
terakilobyte 643aa30cea Fix json typo 2015-06-15 18:59:56 -04:00
greasan e5a4c2f8f5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-15 18:54:20 +02:00
LumenTeun 4b349ff761 Check fix in 'Bootstrap Grid'. #907 2015-06-15 18:26:44 +02:00
LumenTeun 667a37cac7 Test for almost palindromes. #911 2015-06-15 18:14:55 +02:00
LumenTeun 8ae797d582 Improves check for catphotoapp.com. Fixes #914 2015-06-15 18:06:09 +02:00
LumenTeun 466395eb74 Fixed Zipline jQuery.getJSON() links. Fixes #918 #919 2015-06-15 17:43:52 +02:00
LumenTeun 2911562888 More 'Convert HTML Entities' test cases. Fixes #924 2015-06-15 17:26:37 +02:00
Quincy Larson d5b5973326 Merge branch 'interview' into staging
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
Quincy Larson 9589b6abeb add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
Quincy Larson ef99b91951 first challenge json file updated with dashedname 2015-06-13 23:50:36 -07:00
greasan 4693518192 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-12 22:19:10 +02:00
Quincy Larson fc7ac3b3ca Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
greasan b12fcae985 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-10 07:16:02 +02:00
Quincy Larson 3b861a5a7f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
greasan 3c042cba30 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-05 15:48:38 +02:00
Quincy Larson 323ec3d587 change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez 87f22a5b7e fix challengeSeeds should be arrays 2015-06-04 12:31:33 -07:00
Quincy Larson 67d35540cd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
Berkeley Martinez 9032880e27 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00