Commit Graph

2688 Commits

Author SHA1 Message Date
3555c2ba4f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-01 15:39:55 -08:00
595f8d3271 remove facebook from footer 2015-02-28 20:59:39 -08:00
50b29eb2ba Refactor error message from bonfire 2015-03-01 09:54:03 +09:00
ea9691de1c Added new bonfire "No repeats please" 2015-03-01 08:58:05 +09:00
43f9a9c30b Clean up bonfire descriptions 2015-02-28 17:57:58 +09:00
09fed4eba8 Merge branch 'master' of heroku.com:freecodecamp 2015-02-28 17:57:13 +09:00
d70fd24583 clean up pairwise 2015-02-28 17:51:23 +09:00
2c27d6d965 Added pairwise bonfire 2015-02-28 17:46:17 +09:00
2d40779a96 Adding missing letters bonfire 2015-02-28 17:33:45 +09:00
df2ba2e486 Rename anagrams to mutations 2015-02-28 17:14:04 +09:00
d896857fd3 Added new anagram bonfire 2015-02-28 17:03:36 +09:00
a9c7535f3f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-27 14:01:06 -08:00
d962e3afe5 fix a line spacing issue 2015-02-27 14:00:47 -08:00
57847c61ce Merge pull request #128 from waffle-iron/master
waffle.io Badge
2015-02-27 18:22:04 +09:00
2eb3ac41a6 add waffle.io badge 2015-02-27 02:18:46 -07:00
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
3c1ee02246 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-26 14:38:29 -08:00
a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
dfa15d8fc1 add menu text to the hamburger menu on mobile 2015-02-26 13:22:12 -08:00
907415e13d add alt text to learn-to-code images 2015-02-26 12:44:32 -08:00
2cc469e293 Refactor undefined check for mainjs, add a challengeName to email signup page 2015-02-27 05:02:52 +09:00
8acf44ed86 Updated bonfires, added new challenge binary agents 2015-02-26 19:42:47 +09:00
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
efb35b2b42 Merge pull request #117 from FreeCodeCamp/brndnb-bonfire-update
Update bonfire challenge description
2015-02-26 16:42:20 +09:00
a89139119a update navbar link to challenges 2015-02-25 14:22:42 -08:00
216eae90c6 Updating local branch.
merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-02-24 13:11:39 -05:00
d446dbbd53 Updated description for Sorted Union bonfire for clarity. 2015-02-24 13:10:34 -05:00
9ce991b9df Update bonfire challenge description
Clarified the description on the Return Largest Numbers in Arrays challenge.
2015-02-23 21:37:57 -06:00
120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
f4fcb565f4 Merge branch 'master' into ux-improvements
Conflicts:
	seed_data/coursewares.json
2015-02-22 18:17:47 -08:00
55f892a974 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 18:16:42 -08:00
fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00
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
67ff808734 Merge branch 'master' into ux-improvements
Conflicts:
	views/bonfire/show.jade
2015-02-22 15:26:22 -08:00
3833053221 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-22 15:05:15 -08:00
0674466f5f Add bitly url shortening to twitter buttons 2015-02-23 08:01:55 +09:00
bc2bf90d51 fix a bug in a view 2015-02-22 15:00:05 -08:00
dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
9b16174070 Merge pull request #114 from reddock/master
Flip windows and mac gitter links
2015-02-23 05:45:11 +09:00
380e301a9a Flip windows and mac gitter links 2015-02-22 08:05:32 -07:00
ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
5a68ac5411 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 01:27:52 -08:00
36cf4196f5 fix some messed up json 2015-02-22 01:27:27 -08:00
3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
90caed3369 More UX improvements 2015-02-22 16:46:55 +09:00
a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
150226f4cf add all old challenges to our coursewares.json file after normalization 2015-02-21 22:50:46 -08:00
8a5e3d9a9a Merge branch 'ux-improvements' of https://github.com/freecodecamp/freecodecamp into ux-improvements 2015-02-22 14:58:50 +09:00
89eb361ec3 Merge master 2015-02-22 14:58:45 +09:00