terakilobyte 2af8e4bf5c Merge remote-tracking branch 'upstream/master'

2015-04-22 21:13:21 -04:00

..

bonfire.js

merge pr for unique story slugs

2015-04-20 00:28:55 -04:00

challengeMap.js

start process of moving wiki over to field guide

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

challenges.js

update camper news and chat challenges to have new videos and updated copy

2015-04-09 12:58:30 -07:00

contact.js

Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development.

2015-02-06 16:55:48 -08:00

courseware.js

Fix courseware update points on completion

2015-04-22 18:41:04 -04:00

fieldGuide.js

fix issues with unauthenticated field guide browsing

2015-04-22 15:50:11 -07:00

home.js

Pull some useful changes from aborted branch

2015-04-16 23:54:26 -07:00

nonprofits.js

get seed data seeding and improve application submitted button

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

resources.js

Fix bug where users could get points for completing the same challenge.

2015-04-17 01:39:55 -04:00

resources.json

remove references to meeting from announcements and notification modal

2015-03-28 10:14:49 -07:00

story.js

merge pr for unique story slugs

2015-04-20 00:28:55 -04:00

user.js

Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00