gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,074 Commits 9 Branches 0 Tags
c57f1b6f9a8f516a4fffd2bc718ac3bb4fc588eb
Commit Graph

2091 Commits

Author SHA1 Message Date
Quincy Larson
c66b501837 start purging the br challenges 2015-07-03 01:08:11 -07:00
Quincy Larson
c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson
21a4dc1808 Merge pull request #1159 from LumenTeun/lumenteun-1151 
'Font degrade'-test now check order of font-familiy.
 2015-07-02 13:57:41 -07:00
Quincy Larson
d3a6ff1ba1 Merge pull request #1160 from LumenTeun/lumenteun-1158 
Slightly clarifies 'Uncomment HTML'.
 2015-07-02 13:56:48 -07:00
Quincy Larson
10f53bdd49 Merge pull request #1161 from LumenTeun/grammar 
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
 2015-07-02 13:56:11 -07:00
Quincy Larson
552ffb40d9 Merge pull request #1163 from kmiasko/staging 
Waypoint: Get Set for Basejumps changed deprecated heroku command
@kmiasko Thanks for fixing this!
 2015-07-02 13:51:23 -07:00
Quincy Larson
d96dde8d68 Merge pull request #1172 from LumenTeun/lumenteun-1168 
Reword parts of 'how-to-npm'-waypoint.
 2015-07-02 13:50:22 -07:00
benmcmahon100
9120edc67c Update basic-html5-and-css.json 2015-07-01 15:28:29 +01:00
benmcmahon100
3955767c79 solution to issue #1173 
this solution may also be needed for some of the other css-based challenges
 2015-07-01 15:16:44 +01:00
LumenTeun
85c628dc00 Reword parts of 'how-to-npm'-waypoint. #1168 2015-07-01 13:46:36 +02:00
Quincy Larson
b27832f0d0 more improvements to html.json 2015-06-30 23:21:34 -07:00
Quincy Larson
7035f1fcf0 finish the color section of the basic html section 2015-06-30 20:10:00 -07:00
Quincy Larson
bc8a677be5 finish the color priority section of basic-html 2015-06-30 18:17:20 -07:00
Krzysztof Miąsko
2bbdf75ab9 Waypoint: Get Set for Basejumps changed deprecated heroku command 2015-06-30 12:25:51 +02:00
LumenTeun
75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson
f6602fe680 half way done creating css priority challenges 2015-06-29 19:17:06 -07:00
LumenTeun
ca9d951ce3 Slightly clarifies 'Uncomment HTML'. Regarding #1158 2015-06-30 03:17:12 +02:00
LumenTeun
33fa2d1939 'Font degrade'-test now check order of font-familiy. Fixes #1151 2015-06-30 02:52:21 +02:00
Quincy Larson
d9fe6dcef1 fix broken challenges and attempt to make streak more lenient. 2015-06-29 16:32:49 -07:00
Quincy Larson
cf167b3c11 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-28 18:03:21 -07:00
Quincy Larson
c4c1a44c48 make the Mobile Responsive Images challenge more robust fixes #998 2015-06-28 18:03:11 -07:00
Quincy Larson
2284a9fcd7 Merge pull request #1115 from NatashaHaggard/923 
Issue 923 - Grammatical error
 2015-06-28 15:24:52 -07:00
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