Commit Graph

2355 Commits

Author SHA1 Message Date
Michael Q Larson
d962e3afe5 fix a line spacing issue 2015-02-27 14:00:47 -08:00
Nathan
57847c61ce Merge pull request #128 from waffle-iron/master
waffle.io Badge
2015-02-27 18:22:04 +09:00
Making GitHub Delicious.
2eb3ac41a6 add waffle.io badge 2015-02-27 02:18:46 -07:00
Nathan Leniz
33c302eaa6 Revert from tight-h3 class to prevent text overlapping when the text wrapped on devices with lower resolution 2015-02-27 18:17:42 +09:00
Michael Q Larson
3c1ee02246 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-26 14:38:29 -08:00
Michael Q Larson
a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
Michael Q Larson
dfa15d8fc1 add menu text to the hamburger menu on mobile 2015-02-26 13:22:12 -08:00
Michael Q Larson
907415e13d add alt text to learn-to-code images 2015-02-26 12:44:32 -08:00
Nathan Leniz
2cc469e293 Refactor undefined check for mainjs, add a challengeName to email signup page 2015-02-27 05:02:52 +09:00
Nathan Leniz
8acf44ed86 Updated bonfires, added new challenge binary agents 2015-02-26 19:42:47 +09:00
Nathan
bd6b9b2887 Merge pull request #118 from aldraco/master
update description on Union Sort bonfire challenge for clarity
2015-02-26 16:42:47 +09:00
Nathan
efb35b2b42 Merge pull request #117 from FreeCodeCamp/brndnb-bonfire-update
Update bonfire challenge description
2015-02-26 16:42:20 +09:00
A. Drake
216eae90c6 Updating local branch.
merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-02-24 13:11:39 -05:00
A. Drake
d446dbbd53 Updated description for Sorted Union bonfire for clarity. 2015-02-24 13:10:34 -05:00
Branden Byers
9ce991b9df Update bonfire challenge description
Clarified the description on the Return Largest Numbers in Arrays challenge.
2015-02-23 21:37:57 -06:00
Michael Q Larson
19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Michael Q Larson
3833053221 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-22 15:05:15 -08:00
Nathan Leniz
0674466f5f Add bitly url shortening to twitter buttons 2015-02-23 08:01:55 +09:00
Michael Q Larson
bc2bf90d51 fix a bug in a view 2015-02-22 15:00:05 -08:00
Nathan
9b16174070 Merge pull request #114 from reddock/master
Flip windows and mac gitter links
2015-02-23 05:45:11 +09:00
Mike
380e301a9a Flip windows and mac gitter links 2015-02-22 08:05:32 -07:00
Nathan Leniz
a087068022 Fix drop it like its hot challenge 2015-02-22 13:55:27 +09:00
Nathan Leniz
b2bd057e8a Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-22 13:27:22 +09:00
Nathan Leniz
ff4fbefc0a Cleaned up where do I belong challenge 2015-02-22 13:24:26 +09:00
Michael Q Larson
e0c82156a7 refactor layout.jade to have universal head, and customize together.js 2015-02-21 14:49:24 -08:00
Michael Q Larson
e5cfa147fa attempt to use togetherjs 2015-02-21 14:22:46 -08:00
Michael Q Larson
93c3a8210f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	app.js
2015-02-21 13:33:52 -08:00
Nathan Leniz
b32f6133db Update bonfire plugin version number to force fresh import on browsers 2015-02-22 06:23:44 +09:00
Nathan Leniz
f077a0f333 New bonfire challenge 2015-02-22 06:18:38 +09:00
Nathan Leniz
6c6307be2e Update helmet rules for ramda 2015-02-22 06:14:05 +09:00
Michael Q Larson
04cd57b919 Revert "add together.js"
This reverts commit a41c37ec03.
2015-02-21 01:53:13 -08:00
Michael Q Larson
dfc44651e2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	app.js
2015-02-21 01:20:17 -08:00
Quincy Larson
2cf308915a Merge pull request #110 from FreeCodeCamp/ramda-fire
Ramda fire
2015-02-21 01:19:16 -08:00
Michael Q Larson
a41c37ec03 add together.js 2015-02-21 01:17:54 -08:00
Nathan Leniz
9a8fd73d53 Merge branch 'master' into ramda-fire 2015-02-21 14:47:55 +09:00
Nathan Leniz
c852aef1be Ramda upgrade 2015-02-21 11:38:03 +09:00
Michael Q Larson
174ed6122b fix an issue of bonfire not lowercasing input from the user when accepting a pairedWith username 2015-02-20 00:13:07 -08:00
Quincy Larson
efacacff79 Merge pull request #109 from FreeCodeCamp/ux-improvements
Ux improvements
2015-02-19 18:14:44 -08:00
Michael Q Larson
85f6c6eb4d make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page 2015-02-19 16:33:08 -08:00
Michael Q Larson
d93e0fb56a uncomment twitter login - it works again 2015-02-19 13:33:08 -08:00
Michael Q Larson
749954542f refactor learn-to-code view to look more visual and have fewer components 2015-02-18 22:58:10 -08:00
Michael Q Larson
34e54f7cae Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-18 21:20:58 -08:00
Michael Q Larson
884ff62bcc make the footer look better on desktop with more descript links and make the go to next challenge button the CTA button style and added the difficulty label to the flames in bonfire 2015-02-18 21:20:44 -08:00
Michael Q Larson
9d60f9e0c5 add Angelica to counselors 2015-02-18 17:30:29 -08:00
Michael Q Larson
c766ad3766 remove twitter login option until we can fix it 2015-02-18 13:18:53 -08:00
Michael Q Larson
4ef8e7eda4 reverse the attempts to allow cross site scripts and just use relative paths for now 2015-02-17 15:35:16 -08:00
Michael Q Larson
5d9e82f9cb update format of AJAX call to json 2015-02-17 15:08:57 -08:00
Michael Q Larson
312debdb95 send json 2015-02-17 14:57:11 -08:00
Michael Q Larson
09e9dcefe0 attempt to configure mimetype for ajax calls 2015-02-17 14:52:46 -08:00
Michael Q Larson
ca9658bf16 update API routes 2015-02-17 14:14:25 -08:00