20 Commits

Author SHA1 Message Date
Quincy Larson
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Quincy Larson
c2a9a1ca62 add an ajax challenge 2015-07-02 17:31:08 -07:00
Quincy Larson
4fb3b3e7cc add more cities and move the bootcamp calculator to field guide entries (still untested). 2015-07-02 13:59:13 -07:00
Quincy Larson
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Quincy Larson
e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Quincy Larson
6972f64697 fix minor issue with controller 2015-06-21 22:46:37 -07:00
Quincy Larson
ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez
629262dd0d fix /chat should go to gitterim 2015-06-20 23:15:10 -07:00
Berkeley Martinez
0623ace259 fix sitemap query's
make rx mapping async
2015-06-20 21:21:36 -07:00
Berkeley Martinez
f17c442018 fix should be story not store 2015-06-20 20:54:39 -07:00
Quincy Larson
a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson
40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
Quincy Larson
2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
Quincy Larson
23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
Quincy Larson
c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
Quincy Larson
43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
Quincy Larson
b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Berkeley Martinez
075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez
e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -07:00