Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware ...

Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade

2015-02-06 14:39:16 -05:00

..

about.jade

add Patrick Ly to our team

2015-02-01 10:25:04 -08:00

blog.jade

add Kamal to counselors and update the about page to include our twitter feed instead of old embedded tweets. Also add @rybar\'s new landing icons

2015-01-29 11:38:07 -08:00

bonfires.jade

Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list

2015-01-24 00:44:08 -05:00

challenges.jade

update the complete all the challenges flow and copy

2015-01-23 15:13:36 -08:00

faq.jade

expand landing page copy and update the faq parital

2015-02-04 12:52:19 -08:00

flash.jade

updated alert messages close icon

2014-07-02 00:43:20 -04:00

footer.jade

update nonprofit project text and add footer back into landing page

2015-02-04 15:26:13 -08:00

meta.jade

update the favicons and add recommended items to public folder

2015-02-02 16:23:24 -08:00

navbar-narrow.jade

now have both full width layout and normal layout

2015-01-26 11:02:22 -08:00

navbar-wide.jade

now have both full width layout and normal layout

2015-01-26 11:02:22 -08:00

navbar.jade

make the account page purely settings and make the photo redirect to the user public profile

2015-01-29 22:01:27 -08:00

stats.jade

remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js

2015-02-01 22:39:59 -08:00