1277 Commits

Author	SHA1	Message	Date
Rohan Mitchell	3a9b13b55e	Reorder methods	2015-07-31 16:56:07 +10:00
Continuous Integration	858a613ba2	Auto-merge from CI [skip ci]	2015-07-17 11:48:16 +10:00
Rohan Mitchell	f3ae812f2b	Update cart when max_quantity value changes, not just quantity	2015-07-16 10:05:19 +10:00
Rohan Mitchell	904a3a5bd4	When add to cart fails, retry every 3 seconds, with no limit of the number of retries	2015-07-16 10:05:19 +10:00
Rohan Mitchell	28b8e0b0c8	Update distance matches when filter settings change	2015-07-10 17:45:17 +10:00
Rohan Mitchell	0ab75fe2ea	Take the first name match from the post-filter results to avoid matching off a result the user can't see	2015-07-10 17:45:17 +10:00
Rohan Mitchell	5b93ac2ae1	Remove unneeded injections, consistent spacing	2015-07-10 17:45:16 +10:00
Rohan Mitchell	7d340d5084	Update taxon search to only display taxons from enterprises on the page	2015-07-10 17:45:16 +10:00
Rohan Mitchell	d8dfb5b5ee	Move most filters back out into view - they now respond to filter preference changes	2015-07-10 17:45:16 +10:00
Rohan Mitchell	06c5ffb427	Wrap geocode callback in ., fixing inconsistent updates	2015-07-10 17:45:16 +10:00
Rohan Mitchell	64bc7404dc	Region-bias geocoder results	2015-07-10 17:45:16 +10:00
Rohan Mitchell	651afc34cb	Notify enterprise change by broadcast	2015-07-10 17:45:16 +10:00
Rohan Mitchell	5f8826533d	Limit distance matches to those within 50 km	2015-07-10 17:45:16 +10:00
Rohan Mitchell	f154a02c86	Add filter for enterprises within a radius	2015-07-10 17:45:16 +10:00
Rohan Mitchell	5b5c56064e	Hide distance matches when there are name matches. Show with a link.	2015-07-10 17:45:16 +10:00
Rohan Mitchell	eba0a12d29	Extract filtering into controller	2015-07-10 17:45:15 +10:00
Rohan Mitchell	7fd4815904	Split results into name matches and distance matches	2015-07-10 17:45:15 +10:00
Rohan Mitchell	7f2508eeaa	When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup	2015-07-10 17:45:15 +10:00
Rohan Mitchell	6e3ca3f90f	Make Geo.distanceBetween take either a LatLng or a locatable at either parameter	2015-07-10 17:45:15 +10:00
Rohan Mitchell	744beaa26a	Perform shops search by proximity instead of plain string match	2015-07-10 17:45:15 +10:00
Rohan Mitchell	d0d9e9e367	Flag enterprises whose name matches a query	2015-07-10 17:45:15 +10:00
Rohan Mitchell	befcc37456	Fix bug in distanceBetween, update docs, deal with null queries	2015-07-10 17:45:15 +10:00
Rohan Mitchell	9fb7c47c73	Enterprises can calculate their distances from a location via geocode lookup	2015-07-10 17:45:15 +10:00
Rohan Mitchell	80bb6c36e3	Rename file	2015-07-10 17:45:15 +10:00
Rohan Mitchell	a61e96c316	Generalise Geocoder service to Geo, add distanceBetween method	2015-07-10 17:45:15 +10:00
Rohan Mitchell	ddf1bb90ea	Add geocoder service	2015-07-10 17:45:15 +10:00
Rohan Mitchell	a509747ba7	Do not show double-ups of places to shop	2015-07-10 15:51:57 +10:00
Rohan Mitchell	3527ae6ea2	Update comment	2015-07-10 15:51:57 +10:00
Rohan Mitchell	e679f1175c	Add shop-for-products-at to map producer modals	2015-07-10 15:51:57 +10:00
Rohan Mitchell	197c99349d	Add error checking to client-side permalink service	2015-07-10 09:42:09 +10:00
Rohan Mitchell	213242627e	Merge branch 'master' into redesign-phase-2 ... Conflicts: app/views/home/_hubs.html.haml	2015-07-01 15:44:36 +10:00
Rohan Mitchell	9f8fa575b3	Scroll past header on shops page if user is logged in	2015-06-26 15:54:25 +10:00
Rohan Mitchell	6197dfe403	Make brand story animate slide down/up	2015-06-26 15:54:25 +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	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	387021929e	Merge branch 'master' into rob-github-fixes	2015-06-16 15:05:01 +10:00
Continuous Integration	c76021462c	Auto-merge from CI [skip ci]	2015-06-16 14:12:16 +10: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	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	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
Rob Harrington	82d31b908f	More styling tweaks	2015-06-12 16:09:53 +08:00
Rob Harrington	066c8876ff	Only serializing unresolved enterprise issues, styling tweaks and fixes for index	2015-06-12 15:49:01 +08:00
Maikel Linke	d717c38f6d	Filter relationships by permission	2015-06-12 17:03:17 +10:00
Maikel Linke	f2bc98e812	E2E: select all permissions	2015-06-12 17:03:17 +10:00
Rob Harrington	6ab5efbe02	Last minute styling adjustments	2015-06-12 12:40:24 +08:00
Rob Harrington	59d5ebe9d4	Changes to copy	2015-06-12 12:32:17 +08:00
Rob Harrington	775718c776	Adding status panel on enterprise index	2015-06-12 12:09:00 +08:00
Rohan Mitchell	4f311543ae	Merge branch 'master' into enterprise-index-revamp	2015-06-12 10:26:11 +10:00