raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 21 Branches 450 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

32 Commits

Author SHA1 Message Date
Rohan Mitchell
6ed9a2620c Use indexed_fees_for for product price 2015-06-18 13:07:52 +10:00
Rohan Mitchell
22230294ab Merge branch 'master' into optimise-shopfront 2015-06-03 10:07:42 +10:00
Rohan Mitchell
99cb09c6f7 When loading products for shopfront, load all variants in one go 2015-05-27 15:44:01 +10:00
Rob Harrington
b9f19d5777 Fixing broken specs 2015-04-17 13:00:20 +10:00
Rob Harrington
b0a29801b6 Making spec controller product request spec a little bit more robust 2015-01-22 10:20:03 +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
Rob Harrington
170b14d0f5 Tightening up expectations in shop controller spec 2014-12-19 15:39:13 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
Rohan Mitchell
2ea7bdbec6 Move controller spec to serializer spec 2014-12-17 14:01:59 +11:00
Maikel Linke
349b7de11a Using simple_order_cycle 
Before: 2 minutes 58.3 seconds
After:  35.04 seconds
 2014-11-28 14:02:55 +11:00
Will Marshall
8496609cc2 Fixing up a couple of regressions 2014-07-29 13:46:38 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
26e8a1fd91 Uncaching some parts and adding specs 2014-07-10 14:49:21 +10:00
Will Marshall
685ba3f63a Fixing my modal and the tests 2014-05-20 12:18:28 +10:00
Will Marshall
9f169e6ef8 Adding a basic stub of the primary taxon 2014-05-16 10:23:31 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
b11533a629 Renaming ShopController to Shop::ShopController 2014-02-07 16:52:18 +11:00
Will Marshall
f3edd15fa7 Switching to using new prices on shop page 2014-02-05 14:57:24 +11:00
Will Marshall
e5c90e80f5 Adding sorting 2014-02-04 14:44:32 +11:00
Will Marshall
60bf431008 Stripping HTML from description, since we seem to occasionally get some 2014-01-22 11:55:57 +11:00
Will Marshall
ef00927885 Adding a nice little JSON/controller test 2014-01-17 14:48:38 +11:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Will Marshall
dd1b3311d7 Removing all the old order populator stuff 2014-01-06 15:23:21 +11:00
Will Marshall
1f012dc52c Patching up the tests to check on our serialisers 2013-12-18 16:15:23 +11:00
Will Marshall
6d124b3275 Failing tests, forcing the orders close text to change 2013-12-18 16:12:06 +11:00
Will Marshall
71a5d84a1d Filtering the products to the current order cycle 2013-12-11 15:06:07 +11:00
Will Marshall
3903173848 Working reloading of products, changing order cycles, sticky state 2013-12-11 13:36:12 +11:00
Will Marshall
04d8949177 Tweaks to the JS, redirection on the controller 2013-12-11 12:53:50 +11:00
Will Marshall
4db8f755bf Getting an order cycle update function in place like a boss 2013-12-11 12:42:02 +11:00
Will Marshall
63dfa0b696 Getting the test framework set up for Angular, setting up a products fetch stub 2013-12-06 15:24:42 +11:00
Will Marshall
ec72e9137a We can now hit the index page 2013-12-05 15:07:46 +11:00
Will Marshall
4543e08872 Renaming everything to Shop 2013-12-05 13:40:05 +11:00