raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,007 Commits 17 Branches 453 Tags
8ee467d2b9d5c9911fbaf6075fa6eb565eb843d4
Commit Graph

1949 Commits

Author SHA1 Message Date
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
07e6a204f3 Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes. 
https://github.com/angular/angular.js/issues/4490
 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
46792a4111 Style results tables 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
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
960e4d3015 Scale logo down when display is very short (ie. iPhone 4) 2015-07-01 15:38:50 +10:00
Rohan Mitchell
7e685b646f Fine-tune header sizes on home page and cutover point for page_alert responsiveness 2015-06-26 15:54:26 +10:00
Rohan Mitchell
eef302635b Fix alert overflow on mobile 2015-06-26 15:54:26 +10:00
Rohan Mitchell
6105d008df Show CTA above the fold on iPhone 5 2015-06-26 15:54:26 +10:00
Rohan Mitchell
dd04afe8f8 Make alert box more legible 2015-06-26 15:54:25 +10:00
Rohan Mitchell
c97ed026d0 Make room in menu for shopping@ text 2015-06-26 15:54:25 +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
4da367a94b Put OFN logo in top bar of mobile site 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
bf953f8987 Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets. 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
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
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
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
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