raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-21 05:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,617 Commits 17 Branches 458 Tags
87b092fdf774f75bbcff44bb18fb7bf3adfcd91f
Commit Graph

276 Commits

Author SHA1 Message Date
Rob Harrington
6f95fa8546 Merge remote-tracking branch 'origin/shopfront-filters' 2014-12-19 15:40:01 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
Rob Harrington
0fa289a443 Changing shopfront message into an alert box 2014-12-19 14:04:02 +11:00
Rob Harrington
3fa1832e7b Adding shop closed message preference 2014-12-19 14:04:01 +11:00
Rob Harrington
d5df73c6a2 Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular 2014-12-19 14:04:01 +11:00
Rob Harrington
5a24f2c0e2 WIP: adding shopfront message to shop 2014-12-19 14:04:00 +11:00
summerscope
ebe2d99299 Change markup because the boolean variable now works correctly 2014-12-19 12:53:26 +11:00
summerscope
08d37b955a Refactoring filter feature for shopfront page - show by default, hide on click. WIP. 2014-12-19 12:22:04 +11:00
Rob Harrington
66bbaabf79 Adding loading gif to shop page 2014-11-07 16:50:31 +11:00
Rafael Schouten
3877bed62b use enterprise modal 2014-10-01 18:51:49 +10:00
Rob Harrington
33dff551c7 Removing 'show profiles' from producer and shop pages 2014-09-25 17:19:57 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
summerscope
5f409e4476 Tweak label for shopping cart CTA button again 2014-08-06 16:59:14 +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
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
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
39a79869c0 Disabling buttons and some work on the price breakdowns, including commenting them out for now 2014-07-29 11:33:25 +10:00
Will Marshall
39f9e991ad Minor regressions and bug fixes 2014-07-28 11:30:35 +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
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
summerscope
6961a2ad00 Take the pop overs out of the tabindex 2014-07-24 10:58:08 +10:00
summerscope
2d25bd8a45 Adding checkout button back to the top as a stop gap measure 2014-07-24 10:57:37 +10:00
Will Marshall
d7ff1cd4af Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-24 10:39:36 +10:00
summerscope
fac7f9f818 Shopfront more styling and improvements for responsive. 2014-07-23 16:36:52 +10:00
summerscope
98e6c5e412 Markup tweaks to tweak inclusion of graph popover button 2014-07-23 15:15:03 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00
summerscope
fe0956d3bb Update markup to make total price its own row on small devices 2014-07-18 16:36:14 +10:00
Will Marshall
a480353158 Working bindings 2014-07-18 16:05:58 +10:00
summerscope
751865a540 More markup tweaks for responsive 2014-07-18 16:05:30 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
summerscope
fca552b254 Adjusting markup and adding classes to target elements as needed for responsive styling 2014-07-18 12:52:59 +10:00
summerscope
957c8cf89b Markup changes to all the partials for new shopfront page design 2014-07-17 17:24:54 +10:00
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
Will Marshall
500e067cfb Performance enhancements 2014-07-11 16:14:44 +10:00
Will Marshall
7bd65d7854 Performance improvements 2014-07-11 15:09:44 +10:00
Will Marshall
c852eefdbc Re-enabling infinite scroll 2014-07-11 15:09:44 +10:00
summerscope
26d6ac5a8d Styling no results message for shopfront 2014-07-11 14:50:40 +10:00
summerscope
23182a9026 Grid system layout for filter buttons for all sizes and breakpoints 2014-07-11 13:10:22 +10:00
Will Marshall
fecc68cff8 Dereferencing product Taxons 2014-07-11 12:40:49 +10:00
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
summerscope
88b1b8b104 Styling search for shopfront page 2014-07-11 12:27:51 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
Will Marshall
0b3b8883cd Disabling infinite scrolling due to bugs on iPad 2014-07-10 11:38:16 +10:00
summerscope
c744c61f25 Styling for shopfront page with search input 2014-07-09 17:35:21 +10:00