Граф коммитов

16 Коммитов

Автор SHA1 Сообщение Дата
Andrew Hayward ce494e89a6 Fixing stupid `error` errors 2013-06-01 01:20:58 +01:00
Andrew Hayward ed9e459455 Aestimia/API updates 2013-05-31 09:36:23 +01:00
Andrew Hayward 93faac386e Merge branch 'master' into applications
Conflicts:
	README.md
	lib/errors.js
	static/media/css/core.css
	static/media/less/core.less
	views/badges/single.html
2013-05-30 02:13:04 +01:00
Chris McAvoy d2bf5dd2c2 Merge remote-tracking branch 'stenington/claims' 2013-05-29 11:45:10 -05:00
Mike Larsson 0b4160fdd5 Adding 409 Conflict error class, differentiating the claim code error reporting a bit 2013-05-29 09:29:25 -04:00
Andrew Hayward 6009502fbb Essentially, I'm an idiot 2013-05-29 12:24:02 +01:00
Andrew Hayward 8d1bac019b Merge branch 'master' into applications 2013-05-29 11:55:32 +01:00
Mike Larsson 2ce6df7e24 Quick fix to prevent undefined status code being set on response 2013-05-28 23:14:47 -04:00
Andrew Hayward 4efec54ab8 Merge branch 'refs/heads/master' into applications
Conflicts:
	static/media/css/core.css
	static/media/css/core.min.css
	static/media/less/core.less
2013-05-29 01:38:31 +01:00
Andrew Hayward 3acc82c56b Additional errors 2013-05-28 18:33:58 +01:00
Andrew Hayward 2411e212ac Thumbnail generators 2013-05-28 18:12:29 +01:00
Andrew Hayward 9632e813a5 Fixing #264 2013-05-22 10:58:49 -04:00
Chris McAvoy 2d563aa830 merging andrew's branch 2013-05-17 15:02:48 -05:00
Andrew Hayward b9eb3d95df A start at standardising error handling 2013-05-16 14:16:33 +01:00
Andrew Hayward db756c659b Generating usernames and passwords 2013-05-16 08:28:37 +01:00
Andrew Hayward 11eabf52e2 Dictionary functionality, for usernames/passwords 2013-05-16 08:25:34 +01:00