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
lerning
8c69030c21
fix grammar
2016-02-23 08:03:12 -06:00
Mrugesh Mohapatra
9f53f68f29
Update the Contributing guidelines with sample.env
...
This commit updates the contributing guidelines with a sample.env
Contributors can simply make a sopy of the same instead of creating
one for the private environment variables.
2016-02-23 12:31:00 +00:00
Berkeley Martinez
89282206e5
Merge pull request #7181 from ltegman/fix/remove-unused-deps
...
Remove unused deps
2016-02-22 15:30:58 -08:00
Quincy Larson
2f613ec216
shorten nonprofit testimonials
2016-02-22 15:30:08 -08:00
Rex Schrader
d146c23945
Merge pull request #7152 from JoshFisk/fix/challange-test-error-0
...
On "Filter Arrays w/ filter" made error match goal
2016-02-22 13:54:50 -08:00
Carolina Knoll
8978b538a4
Fix final errors
2016-02-22 18:54:46 -03:00
Rex Schrader
a46ac7dfdc
Merge pull request #7194 from NolanChan/fix/unhighlight-id
...
coding instructions made consistent in Add ID Attributes to Bootstrap…
2016-02-22 13:50:47 -08:00
Carolina Knoll
283835b7a7
Remove commas and fix minor details
2016-02-22 16:51:48 -03:00
NolanChan
ed3dcf0123
coding instructions made consistent in Add ID Attributes to Bootstrap Elements challenge
2016-02-22 11:31:32 -08:00
Carolina Knoll
be617efcd4
Remove commas and fix minor details
2016-02-22 16:13:37 -03:00
Logan Tegman
2d1a1e6229
Merge pull request #7157 from QuincyLarson/feature/nonprofit-testimonials
...
add testimonial to nonprofit landing page
2016-02-22 10:02:59 -08:00
greenkeeperio-bot
342792e309
chore(package): update validator to version 5.0.0
...
http://greenkeeper.io/
2016-02-22 06:51:57 -08:00
Vladimir Támara Patiño
15ec05f28e
Translation to spanish of api-projects.
...
Thanks for initial translation to @josectello (see https://github.com/FreeCodeCamp/FreeCodeCamp/pull/7016/ )
Closes #6513
2016-02-21 21:43:51 -05:00
Vladimir Támara Patiño
1cbe9506b4
Translation to spanish of bigonotation
...
Closes #6996
2016-02-21 19:12:41 -05:00
Logan Tegman
93f1f1a74c
Remove unused deps
2016-02-21 14:43:15 -08:00
Logan Tegman
c324e807af
Merge pull request #7180 from erictleung/fix/spacing-in-counting-cards
...
Remove unnecessary line break in Counting Cards
2016-02-21 13:45:23 -08:00
Eric Leung
70d4938481
Remove unnecessary line break in Counting Cards
2016-02-21 13:23:53 -08:00
Logan Tegman
c1cbdc5942
Merge pull request #7179 from raisedadead/fix/conversion-kilobytes-to-bits
...
Change correct value of Kilobyte in bits
2016-02-21 12:33:03 -08:00