3680 Commits

Author	SHA1	Message	Date
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
summerscope	91224ed0a4	Merge issues. Removing position fixed on modal window styling.	2014-05-30 14:27:37 +10:00
summerscope	5f6b8c9b5b	Merge branch 'laura_and_will' into icon_font	2014-05-30 13:19:54 +10:00
summerscope	5bdb38e293	Merge issues. Removing position fixed on modal window styling.	2014-05-30 13:19:47 +10:00
Will Marshall	85ee33517a	Restoring another deleted file	2014-05-30 13:19:23 +10:00
summerscope	2c334a0180	Styling for trash icon on checkout page	2014-05-30 13:02:34 +10:00
summerscope	5a7df20a2e	Update icon font for mixins	2014-05-30 12:32:46 +10:00
summerscope	589188d21e	Update icons for Tabs on hub shopping page	2014-05-30 12:32:28 +10:00
summerscope	5c44413ae9	Merge branch 'laura_and_will' into icon_font	2014-05-30 12:18:29 +10:00
summerscope	10418b6035	Merge issues. Removing position fixed on modal window styling.	2014-05-30 12:17:44 +10:00
summerscope	15cde6c372	Merge branch 'laura_and_will' into icon_font ... Conflicts: app/views/groups/index.html.haml app/views/modals/_producers.html.haml	2014-05-30 12:12:07 +10:00
Will Marshall	ee785a3498	Merge branch 'master' into laura_and_will	2014-05-30 12:01:33 +10:00
Will Marshall	1a47a7486e	Automatically closing the accordion if the form is already valid	2014-05-30 11:58:22 +10:00
summerscope	e064aa3173	Restyling labels for new icons in checkout process	2014-05-30 11:49:32 +10:00
summerscope	a7a8c3ecee	Change icon for bullet point for list style	2014-05-30 11:30:52 +10:00
summerscope	0eb4e35ee4	New version of icon font	2014-05-30 11:30:30 +10:00