1946 Commits

Author	SHA1	Message	Date
Rob Harrington	bfe7f49033	Show and hide search box	2015-03-18 12:01:53 +11:00
Rob Harrington	2b32252aff	Filtering between selector lists	2015-03-15 13:25:04 +11:00
summerscope	dc1dd2e243	Changing the class .filter-box for shopfront to .filter-shopfront ... This prevents the issue with inheritance / styling crossover	2015-03-13 16:06:46 +11:00
Rob Harrington	274a7a3c73	Fixing up the one liner filter styling a bit	2015-03-12 09:56:06 +11:00
Rob Harrington	0a300d1802	Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)	2015-03-06 19:03:46 +11:00
Rob Harrington	578475a403	Filter products list on shop by active properties	2015-03-06 16:14:11 +11:00
Rob Harrington	06f10398da	Adding product property filter to shop page	2015-03-06 11:22:52 +11:00
Rob Harrington	067b814daa	Making legacy filters work properly with filter-selector directive	2015-03-05 18:29:12 +11:00
Rob Harrington	cb623b75c1	Generalising taxons-selector -> filter-selector	2015-03-05 18:15:14 +11:00
Rob Harrington	e7854bcd8e	Moving single line selectors to template, making sure other users of taxons-selector still work	2015-03-05 16:38:21 +11:00
Rob Harrington	0142f9467a	Improve display of overflow selectors	2015-03-05 16:00:53 +11:00
Rob Harrington	24b40182b5	clearAll for product page also clears any text search filter	2015-03-05 15:34:27 +11:00
Rob Harrington	ed94cf57d3	Adding the 'more' box for single-line-selectors	2015-03-05 15:10:42 +11:00
Rob Harrington	4afef8215a	Basic implementation of single line selectors	2015-03-05 12:12:36 +11:00
summerscope	fc7abd5d02	Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab	2015-02-25 16:20:10 +11:00
summerscope	469b383781	Properties and shopfront filters with taxons WIP.	2015-02-25 16:04:32 +11:00
summerscope	304bde3b9e	Working on the filters for shopfront properties and updates.	2015-02-25 10:46:51 +11:00
summerscope	e9fca885db	WIP layout changes for shopfront top	2015-02-25 10:46:43 +11:00
Rob Harrington	5c09ebf138	Adding manager managment to enterprise edit form	2015-02-12 11:34:58 +11:00
Rob Harrington	ee5ab22501	Moving interface for changing owner to new 'Users' tab	2015-02-12 11:34:58 +11:00
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	a0990c107f	Moving navigation check to controller	2015-01-22 10:19:44 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	3ec3441cfa	Replacing all uses of the old enterprise shop url helper	2015-01-22 10:19:43 +11:00
Rob Harrington	39889390ef	Altering shop page routing so that shop url is copy-and-pastable	2015-01-22 10:19:42 +11:00
summerscope	1753432f36	Adding new loading animation to replace ugly and large gif	2015-01-16 17:06:40 +11:00
Rob Harrington	1d80bee595	Cart item total reflects total number of items in the cart	2015-01-16 16:06:51 +11:00
Rob Harrington	2c307f09c3	Changing edit cart button to link	2015-01-16 15:47:56 +11:00
summerscope	3bd77c74a5	Improve logic on shopping cart button to add meaningful labels for various states	2015-01-16 14:57:09 +11:00
summerscope	51687b5c2c	Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages	2015-01-16 13:27:16 +11:00
Rob Harrington	b3e67fa164	Take two on disabled logic	2015-01-15 17:34:04 +11:00
summerscope	d2277999cc	Undo change of logic on disabled state on Shopping cart button	2015-01-15 17:13:10 +11:00
summerscope	676e7cb4d6	Make taxon flag 2 cols for small devices	2015-01-15 16:45:09 +11:00
summerscope	1dfbc88813	Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around	2015-01-15 16:16:01 +11:00
summerscope	891a9b06a8	Add expand icon on top of image thumbnail	2015-01-15 15:23:10 +11:00
summerscope	b5879d51ac	Merging master into shopfront-filters branch	2015-01-15 14:15:25 +11:00
Rohan Mitchell	dcc04ea538	On enterprise edit page, do not show side menu links we don't have permission to	2015-01-15 13:43:39 +11:00
Rohan Mitchell	83754a01ef	Make side menu item visibility declarative	2015-01-15 13:43:39 +11:00
Rohan Mitchell	d5437e1508	edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise	2015-01-15 13:43:39 +11:00
Rohan Mitchell	642de2f65f	Only show delete enterprise link when user has permission	2015-01-15 13:43:39 +11:00
Rohan Mitchell	0431e0048c	Merge branch 'master' into variant-overrides-frontend ... Conflicts: app/controllers/shop_controller.rb app/views/shop/products/_form.html.haml spec/controllers/shop_controller_spec.rb	2015-01-12 16:48:51 +11:00
Rohan Mitchell	d40ffeef52	Remove old sidebar	2015-01-09 13:10:17 +11:00
Rohan Mitchell	27bc845b0b	Add correct markup for tax category required asterisk	2015-01-09 12:45:35 +11:00
Rohan Mitchell	22cb8b7a71	Two-space indentation, change 'Shipping categories' to 'Shipping category'	2015-01-09 12:33:26 +11:00
Rohan Mitchell	c6db1d440c	Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category ... Conflicts: app/overrides/spree/admin/products/new/replace_form.html.haml.deface app/views/spree/order_mailer/confirm_email.text.haml	2015-01-09 12:30:19 +11:00
Rohan Mitchell	6adb4194c2	Extract date range form to partial	2015-01-08 10:31:51 +11:00