Commit Graph

5410 Commits (5f9022475ce276ba0e3817332380e8538e51d474)

Author SHA1 Message Date
Quincy Larson ba8119b4da update fb share button and remove vestigial style from main.less 2015-09-09 13:51:13 -07:00
Quincy Larson 0eeb6891f7 Merge branch 'staging' into fb-share 2015-09-09 13:47:54 -07:00
Ben McMahon f4f9f183ba Merge pull request #3203 from FreeCodeCamp/fix/run-button
fix isInitRun flag not set
2015-09-09 21:46:27 +01:00
Quincy Larson 501bd51e8b remove unnecessary elipses from more info buttons 2015-09-09 13:38:18 -07:00
Berkeley Martinez 82f7b3825c Merge pull request #3123 from abhisekp/add-emmet
Restore emmet.io support
2015-09-09 13:15:16 -07:00
Berkeley Martinez c10f81408a add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 12:57:22 -07:00
Berkeley Martinez 7874dc5222 fix isInitRun flag not set
When doing jQuery challenges and starting with failing tests
isInitRun, the flag that prevents initial run from auto submitting
a challenge does not get set due to bonfireExecute not running in
this situation. This fixes that by setting consitantly setting
the flag on failing tests so that when tests do pass by camper
the flag will always be set and allow the camper to continue.

closes #2772
2015-09-09 12:07:00 -07:00
Ben McMahon 3c18fabacf Merge pull request #3195 from awesomeaniruddh/awesomeaniruddh-2779
Wording error in description of HTML waypoint
2015-09-09 18:21:26 +01:00
Ben McMahon ee8b767124 Merge pull request #3199 from FreeCodeCamp/NewCurriculumOrder
Set up new curriculum order
2015-09-09 18:18:37 +01:00
benmcmahon100 7b04184fcc Set up new curriculum order. OOPF is now before basic bonfires and where art thou is now in intermediate 2015-09-09 18:10:22 +01:00
Aniruddh Agarwal 43cfd024df Wording error in description of HTML waypoint
`16 colors` instead of `16 values`
closes #2779
2015-09-09 22:42:55 +08:00
bugron acf6ae2eda fixes a test and some text 2015-09-09 18:32:20 +04:00
ahstro e432536d5f Cleaned up `seed/bonfireMDNlinks.js`
The indentation mixed tabs and spaces, so I converted everything to
spaces. I also edited the top comment to look a bit more stylish.
2015-09-09 10:17:57 +02:00
Anton Strömkvist d15a40ccf3 Merge pull request #2598 from suhussai/suhussai-2557
Added link about Roman Numeral to MDNLinks section.
2015-09-09 10:08:38 +02:00
Quincy Larson 2896cee8f5 simplify fb-share call to action and minimize sizze 2015-09-09 00:10:36 -07:00
Quincy Larson 239fac04f0 Merge branch 'QuincyLarson-learn-button' into learn-button 2015-09-08 23:49:10 -07:00
Quincy Larson cfba4edb29 add further code to be QAd after sleeping 2015-09-08 23:48:11 -07:00
Aniruddh Agarwal 05864b4813 Fixed wording error in HTML/CSS waypoint
Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
2015-09-08 23:48:11 -07:00
Aniruddh Agarwal dccfcfeb2e Fix typo in basic-javascript waypoint
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-08 23:48:11 -07:00
Aniruddh Agarwal b1ceff3ee2 Fixed typo in Basic Javascript Waypoint
Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
2015-09-08 23:48:11 -07:00
Aryan Jabbari b228cc064c Clarifies instructions for shift() challenge; closes #1875 2015-09-08 23:48:11 -07:00
Quincy Larson c4c9068950 start refactoring account view into show view 2015-09-08 22:52:32 -07:00
Berkeley Martinez b2d04ec7c5 remove save to user on return individual user 2015-09-08 22:41:03 -07:00
Berkeley Martinez 9cc862e9a6 add learn button functionality
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
Berkeley Martinez 184ba1fa37 add challengeId to localStorage
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
Quincy Larson f0a4924671 start refactoring next challenge logic 2015-09-08 21:45:53 -07:00
Arsen Melikyan f58e3c07bc Merge pull request #3125 from natac13/change-test-in-javascript-challenges-and-add-optional-spaces-in-jquery-aswell
Test improvements, single and double quote jQuery selectors
2015-09-09 08:39:42 +04:00
Aniruddh Agarwal 44d54b7f69 fixed test descriptions in OOJavascript waypoint
The first and the second waypoints in the Object Orientated and Functional Programming section had errors in the test descriptions
closes #3172
2015-09-09 12:31:42 +08:00
Quincy Larson 1e82165ed2 add learn button back in and fix redirect loop associated with it 2015-09-08 21:15:18 -07:00
Arsen Melikyan c9c454dd69 Merge pull request #3183 from awesomeaniruddh/awesomeaniruddh-3130
Fixed wording error in HTML/CSS waypoint
2015-09-09 08:02:45 +04:00
Arsen Melikyan 1991a81069 Merge pull request #3184 from awesomeaniruddh/awesomeaniruddh-3148
Fix typo in basic-javascript waypoint
2015-09-09 07:58:54 +04:00
Aniruddh Agarwal 471236b814 Fixed wording error in HTML/CSS waypoint
Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
2015-09-09 11:57:39 +08:00
Aniruddh Agarwal 9067154566 Fix typo in basic-javascript waypoint
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-09 11:52:21 +08:00
Arsen Melikyan 90805e1aaa Merge pull request #3181 from awesomeaniruddh/awesomeaniruddh-3169
Fixed typo in Basic Javascript Waypoint
2015-09-09 07:44:40 +04:00
Arsen Melikyan 09c7475145 Merge pull request #3102 from AryanJ-NYC/AryanJ-NYC-1875
Clarified instructions for shift() challenge
2015-09-09 07:25:03 +04:00
Aniruddh Agarwal 1c618799b4 Fixed typo in Basic Javascript Waypoint
Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
2015-09-09 10:02:08 +08:00
suhussai c57251a446 Added link about Roman Numeral to MDNLinks section
Added link mentioned in Waypoint description about
Roman Numerals to MDNLinks in order to make it more apparent.
Affects Waypoint 3 in Intermediate Algorithm Scripting.
http://www.freecodecamp.com/challenges/bonfire-roman-numeral-converter
closes #2557.
2015-09-08 18:21:00 -06:00
Aryan Jabbari b54b2de9ab Clarifies instructions for shift() challenge; closes #1875 2015-09-08 17:31:15 -04:00
Berkeley Martinez d884aaa924 remove contributors list from package.json
We now have over a hundred contributors and this should not be listed in the package.json
2015-09-08 13:45:18 -07:00
Anton Strömkvist c815084d10 Merge pull request #3087 from bugron/bugron-toLowerCase_fix
Fixes 'd[0].toLowerCase() is not a function' error
2015-09-08 22:33:54 +02:00
Anton Strömkvist bd0f7c1c23 Merge pull request #3091 from bugron/bugron-divide_fix
fixes a condition in assert
2015-09-08 22:29:04 +02:00
Anton Strömkvist 3c28cc3cc6 Merge pull request #3088 from bugron/bugron-add_two_num-fix
fixes assert and adds a dot
2015-09-08 22:24:11 +02:00
Arsen Melikyan 83c1b5c8aa Merge pull request #3153 from ahstro/ahstro-3152
Move brace out of user-edit scope
2015-09-08 23:25:25 +04:00
Anton Strömkvist 4b2c209a22 Merge pull request #2921 from bugron/bugron-2803
fixes an idle test and some text
2015-09-08 21:07:55 +02:00
Arsen Melikyan 91d3959bfd Merge pull request #2953 from dmytroyarmak/dmytroyarmak-2948
Add output block to "Iterate with JavaScript For Loops" challange
2015-09-08 21:37:00 +04:00
Berkeley Martinez e738266726 Add contributing guidelines from README 2015-09-08 09:19:28 -07:00
Berkeley Martinez 36acb95a0b Update contributing to best practices
removes mention of contributors group.
mention git rebase article
change to free code camps style guide over AirBnB's.
2015-09-08 09:18:01 -07:00
Berkeley Martinez a8c782214c Merge pull request #3127 from tcyrus/patch-1
Update README.md
2015-09-08 09:08:55 -07:00
bugron e0db3181d3 fixes an idle test and some text 2015-09-08 19:13:20 +04:00
Berkeley Martinez f42b671e17 Merge pull request #3119 from bugron/bugron-bring_br_back
Removes unnecessary 'negative-15' class
2015-09-08 07:25:17 -07:00