3145 Commits

Author	SHA1	Message	Date
Rob H	f688461e84	Add fields for variant display name and display as to bpe	2014-06-12 11:49:53 +10:00
summerscope	860360d81e	Change map container name to remove ofn- which refers to icon font styling	2014-06-12 11:34:01 +10:00
Rob H	8e960c817a	Merge branch 'master' into units	2014-06-11 12:43:40 +10:00
Rob H	44f4ee822c	Move dynamic placeholder logic to directive so that it can be used for master variants too	2014-06-11 12:41:51 +10:00
Will Marshall	74b3c026d2	Merging in maps	2014-06-10 14:54:12 +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	21b6e91913	Moving OFN flash to fixed block	2014-06-10 12:29:31 +10:00
Will Marshall	dbf4f503a9	Restoring my clever flash refactoring	2014-06-10 11:14:52 +10:00
Will Marshall	c07809d328	Rescoping the accordion as well	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
Rob H	6e04eeba07	Adding dynamic text to display as placeholder	2014-06-06 15:43:05 +10:00
Will Marshall	0c313c0dcb	Defaulting cart count to zero if undefined	2014-06-06 14:47:12 +10:00
Will Marshall	2545b06b2d	Adding first and last name read-only fields to credit card	2014-06-06 14:28:33 +10:00
Will Marshall	92eca72f4f	Fixing a couple of paths and clearing localStorage when changing distributor	2014-06-06 14:04:48 +10:00
Will Marshall	54cdc545a4	adding distributor id to localStorage	2014-06-06 14:04:47 +10:00
Will Marshall	afabda788e	Adding the close	2014-06-06 14:04:47 +10:00
Will Marshall	ebe40d3b3d	New icon	2014-06-06 14:04:46 +10:00
Will Marshall	f881197a74	New icons and some more enterprise data	2014-06-06 14:04:46 +10:00
Will Marshall	ddb5150e77	Automatically resizing to fit	2014-06-06 14:04:46 +10:00
Will Marshall	6f2e841100	Adding modals for the map	2014-06-06 14:04:46 +10:00
Will Marshall	c9c1b4709b	Basic but hacky way to get events out of map	2014-06-06 14:04:46 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
summerscope	0c501b58a5	Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points	2014-06-06 11:19:15 +10:00
Rob H	43c5c37326	Add fields for variant display name and display as to bpe	2014-06-06 10:10:41 +10:00
Will Marshall	c75da1ce0d	New icon	2014-06-05 17:14:11 +10:00
Will Marshall	8b1c2b1e9e	New icons and some more enterprise data	2014-06-05 17:12:38 +10:00
Will Marshall	b1b80a1e39	Automatically resizing to fit	2014-06-05 16:49:01 +10:00
Will Marshall	5ffb8decf5	Adding modals for the map	2014-06-05 16:23:43 +10:00
Will Marshall	1ab0d6816c	Merge branch 'laura_and_will' into maps	2014-06-05 15:50:53 +10:00
Will Marshall	843ea9faef	Basic but hacky way to get events out of map	2014-06-05 15:08:50 +10:00
Will Marshall	476eeef69d	Starting on on the map	2014-06-05 12:18:26 +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	69e5459afd	Finishing off the merge with localStorage refactoring with sekrets	2014-06-04 17:22:10 +10:00
summerscope	039108a07d	Styling label on taxons on fat view of active table for hubs (add a little padding to right)	2014-06-04 17:16:47 +10:00
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
Will Marshall	a6a4d28072	Fixing up bugs in the Checkout form	2014-06-04 17:13:18 +10:00
Will Marshall	59c433881e	Making the auto-closing more granular on checkout	2014-06-04 17:12:16 +10:00
Rohan Mitchell	fc3402bbd0	Determine whether to send card field attributes by payment method type	2014-06-04 16:55:27 +10:00
Rohan Mitchell	6a8def3d76	Do not send attributes for card fields when no card is supplied	2014-06-04 16:30:57 +10:00
Rohan Mitchell	37c780ed70	WIP: Send credit card details to server on checkout	2014-06-04 16:20:48 +10:00
summerscope	77f847dcbe	Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu.	2014-06-04 16:06:24 +10:00
summerscope	a6a86612c7	Adding X from new icon font to modal	2014-06-03 11:48:11 +10:00
summerscope	8caccfc5b0	Merge laura_and_will into icon_font	2014-05-30 17:01:49 +10:00
summerscope	ef5b36cddd	Styling producers	2014-05-30 16:39:07 +10:00
summerscope	b19ca3b9c4	Remove whitespace	2014-05-30 16:38:27 +10:00
Will Marshall	5f163eef1c	Tweaking the contact thingy	2014-05-30 16:10:45 +10:00
Will Marshall	5c46057bf3	Merge branch 'master' into laura_and_will	2014-05-30 15:53:03 +10:00
Will Marshall	13c6ce6786	Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty	2014-05-30 15:52:20 +10:00