gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,162 Commits 9 Branches 0 Tags
db80c098e5521c8a61c8f24efc92dfa2f4cb1730
Commit Graph

5162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
Michael Q Larson
f4fcb565f4 Merge branch 'master' into ux-improvements 
Conflicts:
	seed_data/coursewares.json
 2015-02-22 18:17:47 -08:00
Michael Q Larson
55f892a974 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 18:16:42 -08:00
Michael Q Larson
fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08: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
67ff808734 Merge branch 'master' into ux-improvements 
Conflicts:
	views/bonfire/show.jade
 2015-02-22 15:26:22 -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 Leniz
dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09: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
ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Michael Q Larson
5a68ac5411 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 01:27:52 -08:00
Michael Q Larson
36cf4196f5 fix some messed up json 2015-02-22 01:27:27 -08:00
Nathan Leniz
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
Nathan Leniz
b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
Nathan Leniz
90caed3369 More UX improvements 2015-02-22 16:46:55 +09:00
Nathan Leniz
a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
Michael Q Larson
150226f4cf add all old challenges to our coursewares.json file after normalization 2015-02-21 22:50:46 -08:00
Nathan Leniz
8a5e3d9a9a Merge branch 'ux-improvements' of https://github.com/freecodecamp/freecodecamp into ux-improvements 2015-02-22 14:58:50 +09:00
Nathan Leniz
89eb361ec3 Merge master 2015-02-22 14:58:45 +09:00
Michael Q Larson
53bbe90290 find a son format that works with d3 2015-02-21 21:45:25 -08: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
Michael Q Larson
74f6fc6763 continue work trying to get d3 to work 2015-02-20 23:55:19 -08:00
Michael Q Larson
80485a9ad6 one in 100 page loads will show dinosaur in the free code camp graphic 2015-02-20 22:32:39 -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
2e8c6461e6 Start work on D3 cal-heatmap 2015-02-19 17:18: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