9 Commits

Author	SHA1	Message	Date
Quincy Larson	e322b3b7d6	Merge branch 'master' into modals ... Conflicts: seed_data/field-guides.json views/coursewares/showHTML.jade	2015-05-28 17:25:34 -07:00
Quincy Larson	7e08f9d8f5	update videos	2015-05-28 17:22:45 -07:00
Quincy Larson	cc0fba35e5	more minor fixes to json	2015-05-28 02:10:44 -07:00
Quincy Larson	28d2f700c2	add multi-lingual placeholders and update announcement modal	2015-05-28 01:32:56 -07:00
Quincy Larson	eda9f17dfd	add new videos	2015-05-25 20:04:19 -07:00
Quincy Larson	95ab51986e	challenges are working when authenticated	2015-05-25 17:52:00 -07:00
Quincy Larson	dec227582d	fix issues with json discovered after attempting to seed	2015-05-25 16:42:35 -07:00
Quincy Larson	c115bc355a	resequence and retitle challenge sections	2015-05-25 16:37:21 -07:00
Quincy Larson	8fb2f9d2e0	continue fleshing out waypoints	2015-05-25 15:17:04 -07:00