Andrew Hayward e353308741 Merge branch 'master' into guardians ... Conflicts: controllers/backpack.js		2013-06-04 21:54:00 +01:00
..
applications	Template updates	2013-06-04 01:03:44 +01:00
auth	Merge branch 'master' into passwords	2013-05-31 16:13:54 +01:00
badges	Minor badge template updates	2013-06-04 01:52:59 +01:00
challenges	periods added to ends of sentences and org becomes organizational	2013-06-04 13:05:53 -04:00
errors	Fixing stupid `error` errors	2013-06-01 01:20:58 +01:00
includes	Merge branch 'master' into guardians	2013-06-03 16:54:23 +01:00
info	Achieve 1, 2a, 2b numbering with CSS counters	2013-06-04 12:50:41 -04:00
learn	renamed /learn to /explore. fixes #344	2013-06-01 17:44:36 -05:00
orgs	removed remaining "add to your favorites" buttons	2013-06-01 17:38:55 -05:00
programs	changed badges header to reflect earnable badges being displayed on explore detail page. fixes #189	2013-06-04 12:56:40 -05:00
user	Merge branch 'master' into guardians	2013-06-04 21:54:00 +01:00
.gitkeep	Skeleton	2013-03-24 16:52:09 -04:00
claim.html	updated copy on /claim page	2013-06-01 19:11:14 -05:00
filter.html	Merge pull request #365 from paulsmith/mybadges	2013-06-03 08:43:53 -07:00
home.html	renamed /learn to /explore. fixes #344	2013-06-01 17:44:36 -05:00
layout.html	Merge branch 'master' into guardians	2013-06-03 01:05:11 +01:00