Commit Graph

370 Commits

Author SHA1 Message Date
summerscope
fcd0096843 Changing markup to Hub modal (map) to reflect new design 2014-06-18 18:50:59 +10:00
Will Marshall
f54834da01 Changing our composition of producers and hubs 2014-06-17 16:33:43 +10:00
Will Marshall
9bbfc0a393 Starting a set of small functional changes 2014-06-17 12:35:03 +10:00
Will Marshall
349ba112d0 Fixing map issues, adding a nice pretty loader 2014-06-12 11:50:28 +10:00
Will Marshall
75f1bf4f54 Merging in master 2014-06-10 14:53:49 +10:00
Will Marshall
373f698676 Adding loading infrastructure 2014-06-10 14:52:27 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray"
This reverts commit c9d0091cd9.
2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
6f2e841100 Adding modals for the map 2014-06-06 14:04:46 +10:00
Will Marshall
5ffb8decf5 Adding modals for the map 2014-06-05 16:23:43 +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