1461 Commits

Author	SHA1	Message	Date
Rob H	27e992ebcb	Staggered loading of products in BPE	2014-08-08 14:05:51 +10:00
Rob H	b9f49344b4	BPE: Switch column toggle to dropdown, clean up specs	2014-08-08 14:05:51 +10:00
Rob H	9922dc6e79	Replace pagination with infinite scroll on BPE	2014-08-08 14:05:51 +10:00
Rob H	1abbc7fa86	Switch data injection for BPE over to AMS	2014-08-08 14:05:50 +10:00
Rohan Mitchell	e28e86a82c	Remove link from cart to old product page	2014-08-07 16:46:57 +10:00
Rohan Mitchell	d1c9980f3f	Checkout include distribution fees in cart total	2014-08-07 14:47:49 +10:00
summerscope	7d7bf7b1f2	Tweak layout for cart to make it more robust for content and allow for longer product labels	2014-08-07 12:07:35 +10:00
summerscope	5f409e4476	Tweak label for shopping cart CTA button again	2014-08-06 16:59:14 +10:00
summerscope	b06d08015d	Tweak summary label	2014-08-06 16:36:25 +10:00
summerscope	280f6f856b	update go to shopping cart button label try again	2014-08-06 16:36:08 +10:00
summerscope	65b7cadf09	Change label for next button to Go to my cart	2014-08-06 16:28:22 +10:00
summerscope	3de0f7893d	Change the language and layout of order cycle popover	2014-08-06 16:26:32 +10:00
summerscope	581cf442a2	Add ToS as a PDF attachment rather than an external site	2014-08-06 16:24:47 +10:00
summerscope	5d2dda2ee4	Tweak checkout header	2014-08-06 13:34:35 +10:00
summerscope	6515f0f096	Tweak labels to make page heading more consistent, give useful names to SHopping cart and Checkout pages	2014-08-06 13:34:06 +10:00
summerscope	d48b317d3b	Checkout page header update	2014-08-06 13:25:06 +10:00
summerscope	1ca9c60c84	Tweak label to make a distinction between go straight to checkout and just go to shopping cart review	2014-08-06 13:18:58 +10:00
summerscope	aaae8dce2d	Move button out of UL in nesting	2014-08-06 12:57:44 +10:00
summerscope	3475506ad0	Remove the logic around fees breakdown as not showing on this view now	2014-08-06 12:57:16 +10:00
summerscope	e91e638d35	Tweaking cart summary view markup	2014-08-06 12:21:08 +10:00
summerscope	2c95f00485	Adding T&Cs into footer link	2014-08-06 12:02:10 +10:00
Rohan Mitchell	a1dd5dabac	Replace sleep with wait, add cart_dirty spec helper	2014-07-31 11:36:53 +10:00
Will Marshall	e8045cac42	Renaming to state_name	2014-07-31 11:36:53 +10:00
summerscope	46146c83a8	Make the link for product modal just go around the text and not full block	2014-07-31 11:29:02 +10:00
Will Marshall	339e5975fa	Merge branch 'master' into breakdowns	2014-07-30 13:45:46 +10:00
Will Marshall	606981dee9	Merge branch 'maps'	2014-07-29 15:32:23 +10:00
Will Marshall	90eea5cb16	Switching to a single directive to render variants on /shop	2014-07-29 15:23:10 +10:00
Will Marshall	21cc5bc05a	Tweaking product image logic	2014-07-29 13:05:45 +10:00
Will Marshall	f1c4ca98a1	Defaulting to OFN logo	2014-07-29 12:55:58 +10:00
Will Marshall	118e0f9fd8	Rescoping a couple of partials	2014-07-29 12:51:51 +10:00
summerscope	e308b7a3a8	Comment out Price breakdown graph and popover until we can make this work	2014-07-29 12:26:36 +10:00
Will Marshall	c4f7c1af60	Lots of small bug fixes, changing image sizes	2014-07-29 11:33:25 +10:00
Will Marshall	39a79869c0	Disabling buttons and some work on the price breakdowns, including commenting them out for now	2014-07-29 11:33:25 +10:00
summerscope	004de7919a	Add sexy search into groups page	2014-07-29 10:42:30 +10:00
summerscope	6dc15ff075	Make the modal headers consistent	2014-07-28 16:14:20 +10:00
summerscope	33b7df596b	Use a consistent naming convention for hubs and producers on css class skinny-head	2014-07-28 15:03:49 +10:00
summerscope	f53902da0f	Tweak hubs for responsive views	2014-07-28 13:51:44 +10:00
summerscope	78ac55418c	Tweak producers for responsive views,	2014-07-28 13:51:43 +10:00
Will Marshall	20d7484134	Merge branch 'master' into laura_and_will ... Conflicts: app/assets/javascripts/darkswarm/services/order.js.coffee	2014-07-28 13:43:31 +10:00
Will Marshall	39f9e991ad	Minor regressions and bug fixes	2014-07-28 11:30:35 +10:00
summerscope	d3cfceaf94	Producer tab on shopfront tweaks - add producer icon and better classes for responsive	2014-07-25 17:29:15 +10:00
summerscope	237d5a990e	Remove double-up on URL string for social icons	2014-07-25 17:28:23 +10:00
summerscope	5a8fb4670f	Cart styling updates	2014-07-25 16:41:50 +10:00
summerscope	d2850ae794	Tweak the layout of hubs for responsive	2014-07-25 13:16:21 +10:00
Rohan Mitchell	5c5e7e8ed3	Hide checkout paypal button, remove unneeded frontend JS	2014-07-25 12:44:14 +10:00
summerscope	995451351a	Tweak layout of columns for Hubs listing on medium and small views	2014-07-24 17:43:07 +10:00
summerscope	c799d8b387	Make filter button turquoise	2014-07-24 17:41:48 +10:00
summerscope	a3278209ac	Tweak markup for active table Hubs	2014-07-24 16:33:03 +10:00
Will Marshall	bd662d4ec8	Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will ... Conflicts: app/views/shop/products/_master.html.haml	2014-07-24 16:07:56 +10:00
Will Marshall	2120ab96ca	Fixing bugs and spec regressions	2014-07-24 16:02:10 +10:00