Commit Graph

17514 Commits

Author SHA1 Message Date
Rohan Mitchell
19118da82e Remove old landing page cruft 2014-07-17 14:26:07 +10:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Rohan Mitchell
d7a5eb47f3 Store all images in a consistent path, compatible with development, and support S3 all round 2014-07-17 11:07:34 +10:00
Rohan Mitchell
c40c586b6f Store taxon icons in a path consistent with products 2014-07-17 10:23:07 +10:00
Will Marshall
2b1ab53d8e Fixing regressions and refactoring our tests 2014-07-16 16:00:44 +10:00
Will Marshall
cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition 2014-07-16 16:00:28 +10:00
Will Marshall
f4c1cd5253 Merge branch 'master' into caching 2014-07-16 11:47:07 +10:00
Rohan Mitchell
75a59eb5cc Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order. 2014-07-16 11:26:22 +10:00
Will Marshall
ea357b54ab Adding some map searching capabilities 2014-07-16 11:19:16 +10:00
Rohan Mitchell
42b951c972 Variants controller #search filters by distribution 2014-07-16 10:31:12 +10:00
Rohan Mitchell
b7a08bcb9b Add Spree::Variant.in_order_cycle 2014-07-16 09:33:59 +10:00
Rohan Mitchell
0ecfee79d4 Add Spree::Variant.in_distributor 2014-07-16 09:33:59 +10:00
Rohan Mitchell
edeb820c64 Send distributor and order cycle id to order add variant autocomplete search 2014-07-16 09:33:59 +10:00
Rafael Schouten
58e6379e43 Merge branch 'master' into fix_units
Conflicts:
	app/assets/javascripts/admin/products/units_controller.js.coffee
2014-07-14 15:10:26 +01:00
Will Marshall
353ee20feb Animations fix 2014-07-11 17:07:54 +10:00
Will Marshall
744f254353 Patching a minor bug 2014-07-11 17:02:43 +10:00
Will Marshall
5e68d0bab7 Basic final version 2014-07-11 16:51:46 +10:00
Will Marshall
06047a380e Provisional animations 2014-07-11 16:40:44 +10:00
Will Marshall
e940777ede Few more animation fixes 2014-07-11 16:33:23 +10:00
summerscope
d43fa7eed5 Fixing animations for shopfront 2014-07-11 16:16:56 +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
d67992eb7b Tweak animation stylings 2014-07-11 15:07:29 +10:00
summerscope
26d6ac5a8d Styling no results message for shopfront 2014-07-11 14:50:40 +10:00
summerscope
1eb18e8478 Add some padding to first child in active table - should not be styled from animation classes 2014-07-11 14:42:44 +10:00
summerscope
16d39aeacc Tweak line-height on product row in shopfront 2014-07-11 14:41:46 +10:00
summerscope
13cc9ba44d Remove line-height stuff which was making the animation in juddery 2014-07-11 14:41:18 +10:00
summerscope
23182a9026 Grid system layout for filter buttons for all sizes and breakpoints 2014-07-11 13:10:22 +10:00
summerscope
068e3cce1c More tweaks to filters styling 2014-07-11 13:09:42 +10:00
summerscope
c907e35834 More styling on search and filters 2014-07-11 12:56:14 +10:00
Will Marshall
61dbc2cd63 Replace for shipping selector 2014-07-11 12:54:40 +10:00
Will Marshall
21d1d2d1c1 Replacing taxon directive 2014-07-11 12:53:32 +10:00
Will Marshall
190e320bad Pulling some structure out of directives 2014-07-11 12:45:08 +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
Rob H
d4a6624c28 Prevent display_as and display_name from being used when blank 2014-07-11 12:37:19 +10:00
summerscope
40b858306b Make all taxons sentence case. ALl of them! for reals yo. 2014-07-11 12:36:27 +10:00
summerscope
88b1b8b104 Styling search for shopfront page 2014-07-11 12:27:51 +10:00
summerscope
6adc056ce0 Styling filters and search on shopfront 2014-07-11 12:27:35 +10:00
summerscope
46017be45c Make big input fill out all width available 2014-07-11 12:27:17 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
Will Marshall
26e8a1fd91 Uncaching some parts and adding specs 2014-07-10 14:49:21 +10:00
Will Marshall
932ca95ec5 Sorting hubs by active 2014-07-10 13:04:45 +10:00
summerscope
6681beae4d Fix spacing for shopfront page search box 2014-07-10 13:04:20 +10:00
summerscope
0e0cf5576d Restyle big search to make it MORE OBVIOUS. 2014-07-10 12:58:38 +10:00
Will Marshall
f57e8513d5 Spiking out products serializers and caching 2014-07-10 12:46:25 +10:00
summerscope
9fa62b39af More styling for filters and search 2014-07-10 12:22:08 +10:00