Andrew Hayward 84c7ead4ea Merge branch 'master' into passwords ... Conflicts: static/media/css/core.css		2013-05-31 16:13:54 +01:00
..
application.js	Fixing application model	2013-05-28 18:32:22 +01:00
claim.js	Adding claim model to handle badge claim requests and approval process	2013-05-31 11:04:55 -04:00
evidence.js	Fixing evidence model	2013-05-28 18:32:10 +01:00
guardian.js	Overhauling models	2013-04-18 11:48:12 +01:00
learner.js	Merge branch 'master' into sign-up	2013-05-31 15:27:40 +01:00
passwordToken.js	Password reset functionality	2013-05-30 01:06:06 +01:00
signupToken.js	Moving token completion to model	2013-05-16 08:30:02 +01:00