15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	1363daae3c	When fetching ofn commit, if it is not found, return a sentinal value to avoid a wayward git push	2015-06-26 11:22:19 +10:00
Rohan Mitchell	d9f4a92648	Do not use with_products_require_tax_category in around filters - Spree::Config has caching which isn't shared between contexts	2015-06-24 14:52:17 +10:00
Rohan Mitchell	bc11140a40	Make config reset for all tests more robust. Add cache isolation for parallel specs.	2015-06-24 14:02:45 +10:00
Rohan Mitchell	7a36e92592	Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes_optimise-shopfront	2015-06-24 10:09:35 +10:00
Rohan Mitchell	2d79177bb5	When a registering an enterprise with a non-unique name, display an error message.	2015-06-24 10:08:34 +10:00
Rohan Mitchell	f51a9679f2	Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes	2015-06-19 11:34:41 +10:00
Rohan Mitchell	173f4c0f03	Merge branch 'rob-github-fixes' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes	2015-06-19 11:32:55 +10:00
Rohan Mitchell	116565fa0f	Merge branch 'parallel-fuubars' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes	2015-06-19 11:32:44 +10:00
Rohan Mitchell	52887dc699	Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes	2015-06-19 11:32:25 +10:00
Rohan Mitchell	89a571d497	Fix spec coupled to variant overrides	2015-06-18 16:05:35 +10:00
Rohan Mitchell	ff4ee16f06	Fix currency issues, changed logo path	2015-06-18 15:38:46 +10:00
Rohan Mitchell	ae3a69c1af	Put in debugging for failing push-to-prod step (sigh)	2015-06-18 15:29:05 +10:00
Continuous Integration	6d423ac990	Auto-merge from CI [skip ci]	2015-06-18 15:20:12 +10:00
Rohan Mitchell	aa0a031fa0	Fetch indexed variant overrides in one go	2015-06-18 15:03:24 +10:00
Rohan Mitchell	dd2f6d6430	Extract VariantOverride fetching into ScopeVariantToHub#scope	2015-06-18 14:45:40 +10:00
Rohan Mitchell	ce0de6e1dc	Fix push to production - needs includes for get_ofn_commit	2015-06-18 14:25:48 +10:00
Rohan Mitchell	7cc2bc4fde	Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.	2015-06-18 13:11:11 +10:00
Rohan Mitchell	6ed9a2620c	Use indexed_fees_for for product price	2015-06-18 13:07:52 +10:00
Rohan Mitchell	860183e675	Do not double-display deployment output	2015-06-18 12:41:47 +10:00
Rohan Mitchell	1cd9ee399f	Cloak shops page	2015-06-18 10:19:18 +10:00
Rohan Mitchell	b5d841562d	Getting OFN commit should retrieve from meta-data	2015-06-18 10:02:15 +10:00
Rohan Mitchell	9f883db25b	Really show deploy output in real time	2015-06-18 09:57:21 +10:00
Rohan Mitchell	389ac07bd7	Store commit at start of build process and use it throughout	2015-06-17 16:25:34 +10:00
Rohan Mitchell	4da69f78cb	Use fuubar with parallel specs for advance notice of failures	2015-06-17 15:22:08 +10:00
Rohan Mitchell	c5526c78d9	Make enterprise name unique	2015-06-17 15:01:46 +10:00
Rohan Mitchell	470f10a828	Merge branch 'master' into rob-github-fixes	2015-06-16 19:00:54 +10:00
Rohan Mitchell	bf953f8987	Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets. 1.1.0	2015-06-16 18:25:44 +10:00
Rohan Mitchell	0ade5ee3a8	Import style.css file also (not included by default by @import)	2015-06-16 18:00:35 +10:00
Rohan Mitchell	0dbecce65d	Optimise relatives including self - minor improvement	2015-06-16 17:43:13 +10:00
Rohan Mitchell	faee88c404	Merge branch 'master' into redesign	2015-06-16 16:57:09 +10:00
Rohan Mitchell	bf2a7f12e0	Fix interaction between alert and mobile menu. A bit hack-ish, needs some more love.	2015-06-16 16:28:45 +10:00
Rohan Mitchell	02d68c662b	Add titles to all darkswarm pages	2015-06-16 15:31:35 +10:00
Rohan Mitchell	387021929e	Merge branch 'master' into rob-github-fixes 1.0.0 v1.0	2015-06-16 15:05:01 +10:00
Rohan Mitchell	301a3ac090	Rename Blog link to News for consistency with global site	2015-06-16 14:53:54 +10:00
Rohan Mitchell	fd41003fb7	Change all global links to www	2015-06-16 14:47:40 +10:00
Continuous Integration	c76021462c	Auto-merge from CI [skip ci]	2015-06-16 14:12:16 +10:00
Rohan Mitchell	846f4bb4b1	Tweak menu responsiveness: Fix items covering country name, fix ul.right dropping down to next line	2015-06-16 13:02:43 +10:00
Rohan Mitchell	b540f645c3	Split CSS to overcome IE9's 4096 rule limit	2015-06-16 11:57:50 +10:00
Rob Harrington	30af5d4278	Enterprise relatives include self where appropriate for serialized injection data	2015-06-15 19:45:29 +08:00
Rob Harrington	92082ce95c	Adding filter back on producers page	2015-06-15 16:35:41 +08:00
Rob Harrington	1558ddb1eb	Fixing index enterprise serializer so that payment methods issue displays when no payment methods are present	2015-06-15 16:15:06 +08:00
Rob Harrington	0038ebaa1f	Fix styling issue for full sixteen column enterprise index panel	2015-06-15 16:10:33 +08:00
Rob Harrington	943c702e88	Hiding 'more' list if there are no overflow filter selectors	2015-06-15 15:54:55 +08:00
Rob Harrington	fb19feb357	Adding filters back to the hub page	2015-06-15 15:43:43 +08:00
Rob Harrington	e09431fa20	Styling tweaks	2015-06-15 15:43:19 +08:00
Rob Harrington	fb11c93943	Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive	2015-06-15 15:43:01 +08:00
Rob Harrington	727e8a81d6	Making sure enterprise serializer serializes no taxons as an empty array	2015-06-15 15:41:25 +08:00
Rob Harrington	0e96a23a52	Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work	2015-06-15 12:06:23 +08:00
Maikel Linke	80bf6e61ad	redirect /t/products/:id to /	2015-06-13 11:59:52 +10:00
Maikel Linke	c6d01055d6	updating relationship spec	2015-06-12 19:32:56 +10:00