Commit Graph

5327 Commits

Author SHA1 Message Date
ab8b81abb3 Merge pull request #3521 from FreeCodeCamp/tshirt-titles
update the tshirt campaign text
2015-09-27 16:26:08 -07:00
85a5766546 update the tshirt campaign text 2015-09-27 16:25:34 -07:00
0cf3c31a92 Merge pull request #3517 from FreeCodeCamp/fix-tshirt
fix tshirt version 2 not submitting properly bug
2015-09-27 14:01:23 -07:00
5b5b37adff fix tshirt version 2 not submitting properly bug 2015-09-27 14:00:55 -07:00
9d89cf8a7a Merge pull request #3516 from abhisekp/waypoint-modify-array-data
Correct comment in Waypoint - Modify Array Data With Indexes
2015-09-27 23:52:22 +04:00
305f661196 Correct comment
Replace "ourArray[1]" with "ourArray"
close FreeCodeCamp/FreeCodeCamp#3515
2015-09-28 01:04:59 +05:30
d08c3e5a88 Merge pull request #3514 from FreeCodeCamp/tshirt
Tshirt voting mechanism
2015-09-27 11:06:26 -07:00
a64a46cff1 don't show tshirt voting to brand new users 2015-09-27 11:05:44 -07:00
ccf5504537 add tshirt voting mechanism 2015-09-27 10:49:44 -07:00
0634926af0 add t-shirts to view 2015-09-27 01:44:09 -07:00
23a7745415 Merge pull request #3368 from bugron/fix/test-fix_in_bonfire-title-case-a-sentence
Fixes a test in a bonfire
2015-09-24 18:07:27 +08:00
c985a0f16e Merge pull request #3478 from FreeCodeCamp/remove-emails
remove email address from stories
2015-09-23 18:11:13 -07:00
a1d67fa255 Merge pull request #3471 from awesomeaniruddh/fix/rename-zipline
Renamed zipline for consistency
2015-09-23 17:40:30 -07:00
4f11b7d119 Merge pull request #3477 from FreeCodeCamp/fix/redirect-remove-hot
fix prevent redirect to /news/hot
2015-09-23 15:22:56 -07:00
de976c18ba remove email address from stories 2015-09-23 15:20:45 -07:00
bf95314830 fix prevent redirect to /news/hot 2015-09-23 15:05:27 -07:00
29dab96b9b Merge pull request #3475 from FreeCodeCamp/fix/redirect-whitelist
fix only allow redirects on whitelist
2015-09-23 14:55:10 -07:00
baab92e3a0 fix only allow redirects on whitelist 2015-09-23 14:54:08 -07:00
04bdb9677e Merge pull request #3356 from leonfeng/fix/gooleapis
Replace Google-hosted scripts with cdnjs equivalents
2015-09-23 14:53:58 -07:00
326ed99346 Renamed zipline for consistency
Renamed the 'Wikipedia Viewer' ziplines to 'Build a Wikipedia Viewer' to make it consistent with the other zipline names.
2015-09-23 16:27:42 +08:00
9b24c15f29 Merge pull request #3351 from alnero/feature/russian-translation
Add russian translation for the basic-ziplines
2015-09-22 21:16:35 +04:00
d573474525 Merge pull request #3393 from FreeCodeCamp/fix/load-fonts-first
fix load fonts through css
2015-09-21 21:55:51 +02:00
39fdd637d5 fix load fonts through css
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
13d79f8a4f Merge pull request #3321 from natac13/natac13-expect-to-assert-advanced-bonfires
changed expects to assert style tests
2015-09-21 16:56:33 +02:00
0da44d712b Add russian translation for the basic-ziplines 2015-09-21 17:19:22 +03:00
4763f9957c changed expects to assert style tests
more uniform descriptions
closes #3316
2015-09-20 16:24:01 -04:00
5ab8c0a228 Merge pull request #3377 from TylerMoeller/patch-1
Fix typo in html5-and-css.json
2015-09-20 20:27:01 +04:00
f06cf41065 Merge pull request #3369 from bugron/fix/editor-match-error_fix
Fixes two 'editor.match() in null' errors
2015-09-20 17:47:47 +02:00
99f2dc2ac4 Fix typo in html5-and-css.json
The challenge "Nest an Anchor Element within a Paragraph" has a small typo at the end of the English description text as highlighted below:

"Now nest your existing a element within a new p element so that the surrounding paragraph says "View more cat photos", but where only "cat photos" is a link, and the rest of the text is rest is plain text."

This commit removes the final "rest is" highlighted above, giving us this sentence instead:

Now nest your existing a element within a new p element so that the surrounding paragraph says "View more cat photos", but where only "cat photos" is a link, and the rest of the text is plain text.
2015-09-20 08:35:21 -07:00
ed46b0a35c Merge pull request #3372 from radarhere/patch-1
Fixed typo
2015-09-20 17:15:08 +02:00
7adbe8d75c Fixed typo 2015-09-20 13:13:13 +10:00
8129f8a277 fixes two 'editor.match() in null' errors 2015-09-20 02:17:25 +04:00
635d02db03 fixes a test in a bonfire 2015-09-20 01:08:05 +04:00
2d6df96c1f Merge pull request #3361 from awesomeaniruddh/fix/html-permissive-test
Added test to determine num of elements with class
2015-09-19 16:24:26 +04:00
dfe6da9ea6 Added test to determine num of elements with class 2015-09-19 20:18:17 +08:00
a682009025 Replace Google-hosted scripts with cdnjs equivalents 2015-09-19 08:55:04 +08:00
5d3b3c0b51 Merge pull request #3345 from FreeCodeCamp/fix/bootstrap-class
fix invisible div blocking run button
2015-09-17 23:03:20 -07:00
f871db26da Merge pull request #3326 from AEA2002/change/functionName
changed user-named function: replace to myReplace
2015-09-17 22:50:30 -07:00
5da4be5779 Merge pull request #3341 from QuincyLarson/basejump
make "basejump" singular instead of plural on the map
2015-09-17 13:35:22 -07:00
2fee89b0e6 fix invisible div blocking run button
bootstrap classes stack on smaller screens if breakpoints are not
met. This fix removes the smaller screen classes that forced divs
that would otherwise stack to instead overlay each other. This is
the cause of the run button being blocks on smaller screens as a
col that should stack to the bottom was instead being pushed to
top.

closes #1466
2015-09-17 12:42:31 -07:00
17962f65c1 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-09-17 09:58:23 -07:00
723b490932 load lato font after dom ready 2015-09-17 09:57:27 -07:00
e4eda74fa2 Merge pull request #3342 from avastu/Fix-title-case
Fixes "Javascript uses use" typos
2015-09-17 15:23:04 +04:00
63da377fa8 Fixed "Javascript uses use" typo 2015-09-17 01:04:00 -07:00
e63e05c1b6 fix typeof comparison should be to string 2015-09-17 00:18:43 -07:00
1418669757 remove unnecessary doc ready 2015-09-17 00:08:08 -07:00
38d76ec3bb split fonts into two separate files 2015-09-17 00:06:01 -07:00
58a8725d75 make "basejump" singular instead of plural on the map 2015-09-16 23:57:05 -07:00
04727620e4 Merge branch 'leonfeng-enhancement-3311' of https://github.com/leonfeng/FreeCodeCamp into fix/fonts 2015-09-16 23:50:24 -07:00
6487ef4fc7 Merge pull request #3334 from ahstro/fix/typo
Fix typo in bonfire test case
2015-09-16 23:45:49 -07:00