gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,336 Commits 9 Branches 0 Tags
09537ba2c12beec12d4c949a459391fa9b51b338
Commit Graph

1269 Commits

Author SHA1 Message Date
Quincy Larson
1fabe07bcd Merge pull request #1124 from greasan/greasan-translateDE 
First two sections translated into German
 2015-06-28 15:22:58 -07:00
Quincy Larson
bdb2c2989f Merge pull request #1114 from NatashaHaggard/1059 
Issue 1059 - Wording issue on instructions
 2015-06-28 15:22:10 -07:00
Quincy Larson
68dfa51719 Merge pull request #1074 from SaintPeter/staging 
Add video link to Symmetric Differences Bonfire
 2015-06-28 15:20:06 -07:00
Quincy Larson
05cfe86cd0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
Quincy Larson
75c77cdb6f clean up future jquery challenges 2015-06-27 11:56:31 -07:00
greasan
20fde8a8ab Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
Quincy Larson
378f6da221 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
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Natasha Haggard
6c9cb28fdc 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
42eba3becc 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
95b0884df5 Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036 
Issue 1036 - Fixed minor grammatical mistake
 2015-06-24 10:43:12 -07:00
Berkeley Martinez
c3d9598d18 Merge pull request #1102 from NatashaHaggard/patch-2 
Issue 1080
 2015-06-24 10:32:58 -07:00
LumenTeun
95f47de9f0 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
Quincy Larson
1df962bb07 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
bd0a517144 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
99459feb5e Add Symmetric Difference link to bonfire 2015-06-22 21:49:44 -07:00
Natasha Haggard
e3aee8f421 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
d0477bfb2b WP 12-13 ES Translation 2015-06-22 20:22:09 -03:00
terakilobyte
7aff6dd285 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-22 10:31:24 -04:00
terakilobyte
7004e81b4a 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
6950ebc346 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-21 12:25:45 +02:00
brandenbyers
5db883346e Change eqls to equal 2015-06-21 00:56:20 -05:00
Quincy Larson
5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson
dd3d445054 add new chat challenge 2015-06-20 18:12:12 -07:00
greasan
817f27bd5b Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-20 10:46:50 +02:00
Quincy Larson
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson
88286d366f fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
Quincy Larson
fe1b3f4d2a fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Quincy Larson
cd63977687 Merge branch 'master' into staging 
Conflicts:
	seed/challenges/basic-bonfires.json
 2015-06-19 17:39:11 -07:00
Quincy Larson
93ed1cfb1f 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
5f7443c91e Merge pull request #960 from 1hella/1hella-959 
1hella 959
 2015-06-19 17:31:14 -07:00
Quincy Larson
25f4d4c30e Merge pull request #958 from LumenTeun/lumenteun-941 
'No repeats please' test fix.
 2015-06-19 17:29:25 -07:00
Quincy Larson
6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00
Quincy Larson
d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging 
Conflicts:
	server/views/coursewares/showBonfire.jade
 2015-06-19 16:17:59 -07:00
Quincy Larson
93e96643fb Merge pull request #940 from LumenTeun/lumenteun-907 
Check fix in 'Bootstrap Grid'.
 2015-06-19 16:07:48 -07:00
Quincy Larson
40a1ff835c 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
a339c1b60b 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
c2c64b153a Merge pull request #937 from LumenTeun/lumenteun-918 
Fixed Zipline jQuery.getJSON() links.
 2015-06-19 16:03:17 -07:00
Quincy Larson
f200a6f8a3 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
adbbbf3743 fix name and dashed name switched 
close #975
 2015-06-18 20:02:32 -07:00
Stephen Wanhella
9342503873 Added new test with different max number to Bonfire: Truncate a String 
Issue 959
 2015-06-18 17:48:30 -07:00
Brett Guillory
d6db51355e 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
8ade99b5d7 Fixed a word 2015-06-18 17:48:29 -07:00
LumenTeun
842a2efe64 More test cases for 'Seek and Destroy' #942 2015-06-18 11:56:13 +02:00
LumenTeun
d1a12fc894 'No repeats please' test fix. #941 2015-06-17 23:30:08 +02:00
Quincy Larson
d615e94c29 fix minor typo in html challenge 2015-06-16 18:00:17 -07:00
Matias Cao
13c3d213ce WP11 ES Translation 2015-06-16 18:27:58 -03:00
greasan
07c2e6b1c3 Translated basic HTML5 and CSS 2015-06-16 19:40:07 +02:00
greasan
891aa09f04 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-16 19:20:27 +02:00
terakilobyte
e319652373 Fix wikipedia viewer zipline naming 2015-06-16 08:36:54 -04:00