54 Commits

Author	SHA1	Message	Date
Will Marshall	190e320bad	Pulling some structure out of directives	2014-07-11 12:45:08 +10:00
summerscope	34cb672a8d	Adjust column layouts / responsive breakpoints for filter systems	2014-07-10 12:21:54 +10:00
Will Marshall	da02f9c0b0	Adding icons to shipping selectors	2014-07-10 12:02:34 +10:00
summerscope	11ec596133	Layout adjust for taxon filters	2014-07-09 17:23:58 +10:00
summerscope	9587b2a2ed	Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will ... Conflicts: app/views/producers/_filters.html.haml	2014-07-09 16:18:41 +10:00
summerscope	a4729a8d12	Tweak layout on taxon filters	2014-07-09 16:15:27 +10:00
Will Marshall	6f3f40e2e6	Adding query string to search params	2014-07-09 15:45:05 +10:00
Will Marshall	fb8d7907f9	Rearchitecting the thing	2014-07-09 14:07:38 +10:00
Will Marshall	0b27040dcb	Taxon selection finesse	2014-07-09 10:53:52 +10:00
Will Marshall	eb8f59d65b	Tests for the taxon filtering	2014-07-04 15:19:45 +10:00
Will Marshall	f335b6a576	Taxon selectors and show/hide behaviour	2014-07-04 14:09:53 +10:00
Will Marshall	a8fde53715	Removing old file, renaming one to match naming conventions	2014-07-04 13:51:23 +10:00
Will Marshall	f316b8dec5	Adding product modals in new format	2014-06-27 15:15:41 +10:00
Will Marshall	4f3d468db6	Dereferencing groups and adding modals to page	2014-06-24 17:15:31 +10:00
Will Marshall	c09555e380	Tab fixes, new tests, reworking modals	2014-06-24 17:15:31 +10:00
Will Marshall	b3f0cb1e74	Bunch of minor bugfixes	2014-06-24 17:14:01 +10:00
Will Marshall	21589fd5b0	Hack patching home page modals	2014-06-20 16:31:49 +10:00
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
summerscope	a362c2591f	Remove parentheses from address on button	2014-06-20 10:42:52 +10:00
summerscope	e4f4db82da	Tweak markup for producer modal	2014-06-20 09:58:49 +10:00
summerscope	6d20b16c3c	Tweak markup for map modal	2014-06-20 09:58:32 +10:00
summerscope	6a350e4867	Tweak order of classes	2014-06-19 17:07:16 +10:00
summerscope	3747306c31	Styling for producer modal on map	2014-06-19 16:30:36 +10:00
summerscope	c50426328e	Styling for hub modal on map	2014-06-19 16:30:22 +10:00
summerscope	4c160ac83f	Changing markup for CONTACT section of enterprise modal	2014-06-19 15:42:35 +10:00
summerscope	b68d038dd0	Markup adjustments for producer modal on map view - styling all the things! making things dynamic to show and hide	2014-06-19 15:42:35 +10:00
summerscope	a74766909a	Adding a stylesheet specifically for enterprises e.g. hubs and producers	2014-06-19 15:42:34 +10:00
Will Marshall	24f147d81d	Adding pickup and delivery	2014-06-19 14:38:05 +10:00
Will Marshall	f1c4ee6744	Fixing up hub modal	2014-06-19 12:49:28 +10:00
Will Marshall	3b4e600599	Changing producer to enterprise	2014-06-19 12:39:35 +10:00
Will Marshall	58e810a736	Using enterprise in modals	2014-06-19 12:38:30 +10:00
summerscope	710abf96eb	Changing Producer modal markup to reflect new design. WIP commit,	2014-06-18 18:53:31 +10:00
summerscope	f89418c0d6	Update follow markup to reflect new design WIP commit	2014-06-18 18:52:29 +10:00
summerscope	54983845c4	Update contact markup to reflect new design	2014-06-18 18:52:07 +10:00
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