Commit Graph

8073 Commits (a71daa07ce88125f432b7e7bc49beb990d555b0f)

Author SHA1 Message Date
Vladimir Támara Patiño 8699bd3cbe Merge branch 'staging' into fix/ES-bigonotation 2016-02-29 21:57:27 -05:00
Logan Tegman e28796d73d Merge pull request #7279 from pasosdeJesus/fix/ES-update-api-projects
Translation to spanish: corrections for api-projects
2016-02-29 18:51:59 -08:00
Vladimir Támara Patiño 4b7764fdb9 Merge branch 'staging' into fix/ES-bigonotation 2016-02-29 21:47:45 -05:00
Vladimir Támara Patiño d86ecfce87 Translation to spanish: corrections for api-projects, thanks to @alejandroperezforcada 2016-02-29 21:44:53 -05:00
Mrugesh Mohapatra 612ca20563 Merge pull request #7326 from hallaathrad/fix/tests-change-the-font-size-challenge
Changed the faulty/confusing test message
2016-03-01 01:36:27 +05:30
Hallaathrad e20c215a4c changed the faulty/confusing test message 2016-02-29 14:55:59 -05:00
Guilherme Rodrigues 670d8f1dbe Improve PR template with details from CONTRIBUTING
Following discussion from https://github.com/FreeCodeCamp/FreeCodeCamp/pull/7170

Improve template with suggestions from review
2016-02-29 20:38:08 +01:00
Logan Tegman 59b786ce02 Merge pull request #7314 from erictleung/fix/pairwise-spelling
Fix spelling in Pairwise challenge
2016-02-28 16:22:07 -08:00
Eric Leung a116bfd344 Fix spelling in Pairwise challenge 2016-02-28 16:20:24 -08:00
Logan Tegman fab5572d34 Merge pull request #7306 from demipixel/fix_text
Make "Pairwise" description clearer
2016-02-28 09:50:34 -08:00
greenkeeperio-bot 973114c06a chore(package): update frameguard to version 1.1.0
http://greenkeeper.io/
2016-02-28 09:20:57 -08:00
DemiPixel 1c61dad1d2 Make "Pairwise" description clearer
Somebody trying to do it found it confusing and so did I so I tried to improve the example a bit to be a bit clearer about why it returned 11.
2016-02-28 00:43:52 -08:00
Akira Laine cf19fbfa46 Merge pull request #7298 from johnmhenson/readme-grammar
Fix grammatical issues in README.md
2016-02-28 18:34:38 +11:00
John Henson 87eccd46be Fix grammatical issues in README.md
I worked on correcting subject-verb agreement, capitalization, punctuation, hyphenation, and errant marks.
2016-02-28 01:52:13 -05:00
Logan Tegman 17d4033236 Merge pull request #7286 from thejonathangraham/feature/french-gettingstarted
French translation: Getting Started
2016-02-27 09:48:47 -08:00
Jonathan Graham 494b78980b French translation: Getting Started 2016-02-27 16:26:00 +00:00
Quincy Larson 2c0afe2e92 Merge pull request #7112 from Greenheart/fix/update-readme
Update description of our community and curriculum
2016-02-26 16:33:33 -08:00
Quincy Larson 41db0a353f Merge branch 'carolinaknoll-add/PtBR-translation-html5-and-css' into staging 2016-02-26 16:10:03 -08:00
Quincy Larson 4413e9b5af Merge branch 'staging' into carolinaknoll-add/PtBR-translation-html5-and-css
Conflicts:
	seed/challenges/01-front-end-development-certification/html5-and-css.json
2016-02-26 16:07:45 -08:00
Quincy Larson 525d91f4b7 Merge branch 'add/PtBR-translation-html5-and-css' of https://github.com/carolinaknoll/FreeCodeCamp into carolinaknoll-add/PtBR-translation-html5-and-css 2016-02-26 15:54:56 -08:00
Quincy Larson 2f7aa1d2a0 Merge pull request #7187 from pasosdeJesus/fix/ES-update-api-projects
Translation to spanish of api-projects.
2016-02-26 15:51:13 -08:00
Logan Tegman a3077c8acf Merge pull request #7235 from NolanChan/fix/require-text-field-close
Added test to check for well-formed input element
2016-02-26 13:03:24 -08:00
Logan Tegman d415f97a48 Merge pull request #7266 from techtolentino/fix/text-in-instructions-inconsistent-size
Fixing inconsistent text size in challenge instructions
2016-02-26 12:59:38 -08:00
NolanChan 57688f2772 Added test to check for well-formed input element 2016-02-26 09:58:07 -08:00
Randy Tolentino a6f2373efd Escaped the `h4` in the `challenge-instructions sentence` block because the `h4` was causing the issue with inconsistent text. 2016-02-26 11:22:16 -06:00
Mrugesh Mohapatra 4cbbbe160b Merge pull request #7253 from afr114/fix/bug_7171
Removes broken link in terms of service.
2016-02-26 12:57:45 +05:30
Logan Tegman cac3a166f8 Merge pull request #7145 from raisedadead/fix/update-contributing-guide
Update the Contributing guidelines with sample.env
2016-02-25 22:58:23 -08:00
Logan Tegman fd0bfe7aa3 Merge pull request #7254 from erictleung/fix/format-console-log-correctly
Lowercase console.log in output box
2016-02-25 22:21:44 -08:00
Eric Leung 49110b610b Lowercase console.log in output box 2016-02-25 22:11:38 -08:00
afr114 604fbede86 fix bug 7171 2016-02-25 20:47:54 -08:00
Logan Tegman 14b77533c5 Merge pull request #7238 from ChristianLapinig/fix/submit-button-tests
Fix test case so only the word "submit" can pass test
2016-02-25 18:55:44 -08:00
Logan Tegman 7775ba051d Merge pull request #7228 from pasosdeJesus/add/ES-jslingo
Translation to spanish of jslingo.json
2016-02-25 18:45:34 -08:00
Vladimir Támara Patiño 94d0d8c77a Translation to spanish of jslingo.json
Closes #6999
Thanks for corrections to @justinian336
2016-02-25 21:31:21 -05:00
Logan Tegman f578069008 Merge pull request #7192 from FreeCodeCamp/greenkeeper-validator-5.0.0
Update validator to version 5.0.0 🚀
2016-02-25 11:21:21 -08:00
Logan Tegman f235dcb38c Prevent validator being called on non-strings 2016-02-25 11:14:09 -08:00
Christian Lapinig 7d82b0776d Fix test case so only the word submit can pass test 2016-02-25 01:15:16 -08:00
Logan Tegman 2d25a55882 Merge pull request #7210 from FreeCodeCamp/greenkeeper-eslint-plugin-react-4.1.0
Update eslint-plugin-react to version 4.1.0 🚀
2016-02-24 22:02:10 -08:00
Logan Tegman 4280eecc55 Merge pull request #7196 from QuincyLarson/fix/nonprofit-testimonials
Shorten nonprofit testimonials
2016-02-24 15:12:02 -08:00
Arsen Melikyan 2bc9ff9265 Merge pull request #7183 from pasosdeJesus/fix/ES-jquery
Verifies and updates translation to spanish of jquery.json
2016-02-24 22:37:48 +04:00
Arsen Melikyan 1d8b243ad7 Merge pull request #7184 from pasosdeJesus/fix/ES-intermediate-bonfires
Verifies and updates translation to spanish of intermediate-bonfires.json
2016-02-24 22:31:45 +04:00
Vladimir Támara Patiño 4b89084065 Verify and update translation to spanish of jquery.json
Closes #6504
Thanks for correction to @justinian336 and @bugron
2016-02-24 13:31:06 -05:00
Arsen Melikyan d1dcacbae0 Merge pull request #7217 from pasosdeJesus/fix/ES-update-bootstrap
Updates translation to spanish of bootstrap
2016-02-24 22:26:13 +04:00
Vladimir Támara Patiño 24b1d2d49e Verify and update translation to spanish of intermediate-bonfires.json
Closes #6502
Thanks for corrections to @justinian336
2016-02-24 13:26:10 -05:00
Vladimir Támara Patiño ff00545075 Updates translation to spanish of bootstrap
Closes #6498
Thanks for corrections to @justinian336
2016-02-24 13:15:47 -05:00
Arsen Melikyan 92c812b477 Merge pull request #7204 from justinian336/Audit/ES-Translation-of-html5-and-css.json
Audit ES Translation of html5-and-css.json
2016-02-24 20:29:16 +04:00
justinian336 c28e452f14 Audit ES Translation of html5-and-css.json. Thanks to @vtamara for the corrections. 2016-02-24 16:21:25 +00:00
Arsen Melikyan c9db30fd30 Merge pull request #7200 from pasosdeJesus/fix/ES-chromedevtools
Translation to spanish of chromedevtools.json
2016-02-24 14:08:36 +04:00
Vladimir Támara Patiño ae25894be9 Translation to spanish of chromedevtools.json
Closes #6997
Thanks for corrections to @justinian336
Deleting temporary files, introduced by mistake.
2016-02-24 04:54:27 -05:00
greenkeeperio-bot 7181319152 chore(package): update eslint-plugin-react to version 4.1.0
http://greenkeeper.io/
2016-02-23 15:07:18 -08:00
Logan Tegman eedbb15586 Merge pull request #7203 from lerning/staging
fix grammar
2016-02-23 07:46:44 -08:00