mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 03:02:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,317 Commits 54 Branches 76 Tags
7d5643e30df73fb91d0da52b94e00a3af769eb0e
Commit Graph

796 Commits

Author SHA1 Message Date
Skud
7d5643e30d Sort nearby members by distance 
Also removed distance/units from the places/show search, since you can
adjust nearness by zooming etc.

At this point the "members near here" stuff at the bottom of the page
exists mostly for accessibility and to give additional detail that we
don't currently show in the popups on the map.

So we're not using distance/units to search for members near here
anymore, but instead are just finding the 30 nearest members to the
specified location, and showing them in order of nearness.
 2013-09-11 12:41:01 +10:00
Skud
3cd48f751e Redid places/show using the all-javascript method. 
Moved JSON for "what's here?" from members/index to places/index -- we
can improve this later if we want to show things other than members.
 2013-09-11 12:14:18 +10:00
Skud
f201f357da reinstated map attribution 2013-09-11 10:28:19 +10:00
Skud
c02772d219 Spike: use pure javascript and JSON API to draw map 2013-09-09 22:15:47 +10:00
Miles Gould
0bb482d181 Use Leaflet marker clusters. 
Doesn't work - clusters don't spiderfy at max zoom, show their
boundaries on hover or split when you get close to them.
 2013-09-05 13:40:20 +01:00
Miles Gould
d6972da84f Speed up geocoding/deal better with slow geocoding. 
- set limit=1
 - set timeout=10s
 2013-09-05 13:10:47 +01:00
Miles Gould
67ed1e2170 Set map height in CSS; smaller for phones. 
In future we should consider making classes for different sizes of maps.
 2013-09-05 12:25:45 +01:00
pozorvlak
3beb2e27f2 Merge pull request #292 from pozorvlak/places2 
Added "places" pages to show maps of where members are
 2013-08-31 08:12:27 -07:00
Miles Gould
71ea2b0485 Remove "\/" from escaped JavaScript to prevent test errors. 
We were getting annoying "couldn't close <p> with </script>" messages
when running tests, because escape_javascript was turning </p> into
<\/p>. We fixed this by gsub'ing \/ to / after calling
escape_javascript. What could possibly go wrong? :-)
 2013-08-31 16:07:27 +01:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
martyhines
b49d548240 Escape pop-up text in place/show 2013-08-31 15:43:25 +01:00
pozorvlak
fd24680a16 Merge pull request #301 from attlebish/hidecrops 
Hidecrops
 2013-08-31 06:21:00 -07:00
Miles Gould
d9cb1cba89 Merge branch 'bulb' into dev 2013-08-30 12:01:43 +01:00
Miles Gould
087c2c5834 Remove extra whitespace. 2013-08-30 11:59:59 +01:00
Skud
ffeda3007a added help text/links to planting form 2013-08-30 16:37:59 +10:00
Lilly
0c45fde749 Hide members when in mobile view 2013-08-30 15:53:16 +10:00
Lilly
310b40aace Hide crops when in mobile view 2013-08-30 15:47:36 +10:00
Lilly
5c4ee581cc Added 'bulb' as a 'planted_from' option. 2013-08-30 15:08:23 +10:00
Skud
b73c4db17a Merge branch 'newsletter' of https://github.com/Skud/growstuff into Skud-newsletter 
Conflicts:
	db/schema.rb
	spec/models/member_spec.rb
 2013-08-29 00:06:44 +10:00
Miles Gould
2c6e2ee2d7 Merge branch 'dev' into places2 
Conflicts:
	app/views/members/_popover.html.haml
 2013-08-28 13:02:25 +01:00
Miles Gould
ca236ce7fd Improve readability of controllers/places slightly. 2013-08-28 12:24:12 +01:00
Miles Gould
c955504ad7 Reinstate Geocoder lookup 
Direct Nominatim lookups were playing badly with "nearby" method in
testing. The slowness is largely fixed in the HEAD revision of Geocoder.
 2013-08-28 12:00:58 +01:00
Skud
0c5fae1274 Send Growstuff login_name to Mailchimp 
This lets us do mail merges with the member's name, as well as letting
us segment mailouts by people who've signed up for Growstuff and those
who came to the newsletter directly without having a Growstuff account.
 2013-08-28 10:42:40 +10:00
Skud
411c5bcd04 split the difference: pre-checked newsletter signup + friendly text 2013-08-27 23:09:15 +10:00
Skud
1433a51b91 Add text to show we're lovely people and not spammers 2013-08-27 22:54:30 +10:00
Skud
f747db7518 newsletter subscription/unsubscription via Mailchimp API 2013-08-27 22:45:18 +10:00
Skud
16f4e153f2 Made admin/newsletter page with list of subscribers 2013-08-27 21:49:54 +10:00
Skud
30bb877537 Added wants_newsletter scope to Member 
also cleaned up member tests which were using FG.build instead of
.create
 2013-08-27 21:34:30 +10:00
Skud
290535b557 Add newsletter subscription checkbox 2013-08-27 21:22:35 +10:00
Skud
99bfc704dc Added plantings_count (i.e. counter_cache) to Member 
Also removed the superfluous .plantings_count method on Crop, which was
causing some confusion.

A thing we learned today: we should use .size to find the size of
ActiveRecord collections, not .count, because .count doesn't use the
cache (while .size does).
 2013-08-26 13:54:09 +10:00
Skud
ff2a3cf8b2 Set planting owner automatically in controller 2013-08-26 12:23:41 +10:00
Skud
475a402133 Refactor ALL THE THINGS 
Refactored tests to take into account that plantings now have owners
directly, not via gardens. Mostly this was just tweaking FactoryGirl
calls to do the right thing.
 2013-08-26 12:17:23 +10:00
Skud
1ad416269d Added owner to planting 
Previously we got the owner indirectly, through the garden in which the
planting was planted.  Now we're directly specifying an owner.  This
allows us to let people plant things in each other's gardens.

Tests are probably broken at this point; we're about to refactor ALL THE
THINGS.
 2013-08-26 12:17:06 +10:00
Skud
af3d6a50a3 Fixed CSS problem with popup tip 
The little triangle underneath the popup was looking weird.  Turns out
it was mostly because of some of the leaflet_ie.css stuff, so we made
sure that the non-IE CSS took precedence, and wrote in a little override
for an unwanted border as well.
 2013-08-26 11:06:21 +10:00
Miles Gould
dfa3c410fc Show names of members in popovers in places/ 2013-08-23 14:37:29 +01:00
Miles Gould
60ddc82d9f Credit OpenStreetMap under ODbL. 
- broke map attributions into a partial
 2013-08-23 14:36:30 +01:00
Miles Gould
8ce2798fb3 Fail gracefully if location is not found. 2013-08-23 14:12:04 +01:00
Miles Gould
89fa16f5b3 Re-add member name to popups; fix escaping problems. 2013-08-23 14:04:43 +01:00
Miles Gould
7857bfd0df Merge branch 'dev' into places2 
Fix up broken indentation on navbar.
Conflicts:
	app/views/layouts/_header.html.haml
 2013-08-23 13:29:37 +01:00
Miles Gould
4e62991f22 Replace Geocoder lookups with direct calls to Nominatim. 
This is because Geocoder-via-Nominatim was really really slow (up to
10s).
 2013-08-23 13:11:02 +01:00
Skud
5a87ecfeeb Merge branch 'dev' of https://github.com/Growstuff/growstuff into location-autocomplete 2013-08-22 15:09:31 +10:00
Skud
4cdb571e27 Merge pull request #284 from Skud/wrangler-homepage 
added a basic crop wrangler homepage
 2013-08-21 21:54:04 -07:00
Skud
9df8ec15ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into member-bio 
Conflicts:
	db/schema.rb
 2013-08-22 13:15:02 +10:00
Joseph Caudle
190e287cca Merge pull request #285 from Skud/tradable_nowhere 
fixed bug with tradable_to reverting to 'nowhere'
 2013-08-21 19:22:09 -07:00
Joseph Caudle
9a3e3390a7 Merge pull request #286 from Skud/redirect-after-signin 
don't redirect to homepage after signin
 2013-08-21 19:19:06 -07:00
Skud
656edefb5f Eager loading for frequently-accessed/database-heavy pages 2013-08-22 10:18:33 +10:00
Skud
b47771d29c We need to refresh member thumbnails more often 2013-08-22 10:18:16 +10:00
Skud
5de6d4389f Oops, we weren't caching interesting members 2013-08-22 10:18:02 +10:00
Skud
ef61753e7b Merge pull request #287 from Skud/redesign-homepage 
Redesign homepage
 2013-08-21 07:40:53 -07:00
Skud
960d3064f5 don't like this line-height 2013-08-22 00:35:14 +10:00