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

..

Bonfire.js

factor challenges and bonfires into smaller json files

2015-05-19 01:58:25 -07:00

Challenge.js

add multi-lingual placeholders and update announcement modal

2015-05-28 01:32:56 -07:00

Comment.js

still working on passing original author email all the way down the comment chain

2015-04-08 00:30:51 -07:00

Courseware.js

factor challenges and bonfires into smaller json files

2015-05-19 01:58:25 -07:00

FieldGuide.js

start process of moving wiki over to field guide

2015-04-08 17:18:51 -07:00

Job.js

add jobs

2015-05-28 16:40:22 -07:00

Nonprofit.js

get seed data seeding and improve application submitted button

2015-04-08 14:57:08 -07:00

Story.js

still working on passing original author email all the way down the comment chain

2015-04-08 00:30:51 -07:00

User.js

Change migration middleware to not rely on boolean flag in User model

2015-05-25 19:55:18 -04:00