Michael Ballard 13c946fd50 Merge branch 'master' of https://github.com/mozilla/CSOL-site ... Conflicts: static/media/js/custom_logic.js		2013-06-06 17:11:18 -04:00
..
applications	Template/style tweaks	2013-06-05 12:08:30 +01:00
auth	Tidying up auth-related templates	2013-06-06 15:10:20 +01:00
badges	Fixing 'Earn' page title	2013-06-06 13:20:37 +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	fixed thumbnails on /explore fixes #484	2013-06-06 10:39:11 -05:00
info	implemented about page lead. fixes #245	2013-06-05 10:35:56 -05:00
learn	renamed /learn to /explore. fixes #344	2013-06-01 17:44:36 -05:00
orgs	Deduplicate badge thumbnail markup	2013-06-05 00:24:12 -04:00
programs	Merge in from master	2013-06-05 14:00:16 -04:00
user	resolving conflicts from @curlee 's pull request	2013-06-06 08:30:27 -05:00
.gitkeep	Skeleton	2013-03-24 16:52:09 -04:00
claim.html	implemented copy for claim page. fixes #474	2013-06-05 15:43:45 -05:00
filter.html	Move filter label options out of JS and into template.	2013-06-06 16:03:21 -04:00
home.html	renamed /learn to /explore. fixes #344	2013-06-01 17:44:36 -05:00
layout.html	consistent footer throughout, removed from .js	2013-06-06 16:14:37 -04:00