Quincy Larson 09b6dae11b Merge branch 'staging' into feature/ctrl-enter-submit ... Conflicts: server/views/coursewares/showBonfire.jade server/views/coursewares/showHTML.jade		2015-09-09 18:32:31 -07:00
..
account	Consistently capitalize GitHub in the account settings text	2015-08-23 13:52:14 +01:00
challengeMap	added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page	2015-08-30 12:43:27 +02:00
coursewares	Merge branch 'staging' into feature/ctrl-enter-submit	2015-09-09 18:32:31 -07:00
nonprofits	update emails and refine sponsor view	2015-06-25 23:35:48 -07:00
partials	add further code to be QAd after sleeping	2015-09-08 23:48:11 -07:00
resources	added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page	2015-08-30 12:43:27 +02:00
sponsors	update emails and refine sponsor view	2015-06-25 23:35:48 -07:00
stories	Fixes info buttons' text in Camper News search results	2015-08-22 17:11:44 +04:00
home.jade	remove server maintenance warnings	2015-08-18 23:48:31 -07:00
layout-react.jade	separate main manifest generation from sub manifests	2015-08-28 15:56:58 -07:00
layout-wide.jade	move refactor all non-jquery JS to load last	2015-08-16 13:49:43 -07:00
layout.jade	move refactor all non-jquery JS to load last	2015-08-16 13:49:43 -07:00
redirect-https.jade	add redirect for https	2015-07-01 14:35:15 -07:00