3291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Rohan Mitchell	6dfd26ac69	order_with_totals_and_distribut{or,ion}	2014-07-16 10:33:23 +10:00
Rohan Mitchell	42b951c972	Variants controller #search filters by distribution	2014-07-16 10:31:12 +10:00
Rohan Mitchell	f18141c9bb	Use controller login helpers	2014-07-16 10:29:58 +10:00
Rohan Mitchell	d81a78b907	Add spec helper method for logging in as admin in controller specs	2014-07-16 10:15:27 +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
Rohan Mitchell	ff507b4b25	Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb	2014-07-16 09:33:59 +10:00
Rohan Mitchell	3758a8ae2b	Add rake task to export enterprises to CSV	2014-07-16 09:33:59 +10:00
Rohan Mitchell	7a3f68ea38	Update Rails to 3.2.19	2014-07-16 09:33:59 +10:00
Will Marshall	9f5f319edb	Further patching regression	2014-07-11 17:55:06 +10:00
Will Marshall	a73bc2405d	Fixing one regression	2014-07-11 17:08:39 +10: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	a31f17cdbd	Merge branch 'laura_and_will'	2014-07-11 16:51:50 +10:00
Will Marshall	5e68d0bab7	Basic final version	2014-07-11 16:51:46 +10:00
Will Marshall	679547058e	Merge branch 'laura_and_will'	2014-07-11 16:40:47 +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
Rob H	fa337fcd6e	Prevent display_as and display_name from being used when blank	2014-07-10 17:04:35 +10:00
Will Marshall	7dde721486	Adding taxon filtering	2014-07-10 15:26:35 +10:00
Will Marshall	55bd23f02b	Merge branch 'laura_and_will'	2014-07-10 14:18:32 +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
Will Marshall	31cf01ba1b	Sorting hubs by active	2014-07-10 12:59:59 +10:00
summerscope	0e0cf5576d	Restyle big search to make it MORE OBVIOUS.	2014-07-10 12:58:38 +10:00
summerscope	9fa62b39af	More styling for filters and search	2014-07-10 12:22:08 +10:00