10 Commits

Author	SHA1	Message	Date
Will Marshall	6f2e841100	Adding modals for the map	2014-06-06 14:04:46 +10:00
Will Marshall	fc02e7857a	Merge branch 'master' into laura_and_will ... Conflicts: app/views/shopping_shared/_contact.html.haml	2014-06-04 17:24:30 +10:00
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
summerscope	a6a86612c7	Adding X from new icon font to modal	2014-06-03 11:48:11 +10:00
Will Marshall	9903e42811	Adding reset password stuff	2014-05-09 14:26:07 +10:00
Will Marshall	1297520051	Authentication steps test	2014-05-09 14:13:39 +10:00
summerscope	967f2827bf	Make label consistent for Log in	2014-05-08 12:57:04 +10:00
summerscope	e41de9be36	Styling up login modal	2014-05-08 12:51:09 +10:00
summerscope	a7ef1295e4	Tweak styles to adjust break point for menu	2014-05-08 11:48:12 +10:00
Will Marshall	3542799349	Removing pointless foundation crud, reworking the login	2014-05-06 18:28:20 +10:00