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
Skud
cc97fd8f49
think we've FINALLY really fixed the member layout
2013-08-22 00:30:02 +10:00
Skud
908cf41f39
tweaked thumbnail to take up less vertical space
2013-08-21 23:42:16 +10:00
Skud
238fd0b3ff
don't redirect to homepage after signin
2013-08-21 22:51:40 +10:00
Skud
3e84d47c90
fixed bug with tradable_to reverting to 'nowhere'
2013-08-21 21:57:43 +10:00
Skud
c109905cb0
fixed recent activity sorting for posts
2013-08-21 21:42:58 +10:00
Skud
8f7becfa78
added a basic crop wrangler homepage
2013-08-21 21:24:22 +10:00
Skud
836ed7aa85
Added creator to scientific name views etc
2013-08-21 17:52:10 +10:00
Skud
a5b2db3458
added creator to scientific names
2013-08-21 17:50:51 +10:00
Skud
57fe663675
Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2
...
Conflicts:
app/controllers/members_controller.rb
app/models/member.rb
app/views/members/_popover.html.haml
spec/models/member_spec.rb
2013-08-21 17:35:31 +10:00
martyhines
098595721b
Added crop creator to crop edit form
2013-08-20 21:46:22 -04:00
martyhines
e77f7fdf31
Added creator field to crops
2013-08-20 21:22:02 -04:00
Skud
347be0633b
cache posts/forums on homepage
2013-08-20 18:59:13 +10:00
Skud
10cb0d3bfc
changed about link in footer to point to specific wiki page
2013-08-20 14:36:32 +10:00
Skud
1b8cd3db6d
reinstate members to logged in homepage
2013-08-20 10:25:24 +10:00
Skud
119d3bd0d3
added posts to homepage, tweaked display
2013-08-19 23:01:30 +10:00
Skud
91cce3e360
fixed weird spacing on member index
2013-08-19 22:07:44 +10:00
Skud
107bd19d29
added more info to member popover
2013-08-19 22:07:34 +10:00
Skud
c64e0f5fc7
various tweaks/fixes for caching
2013-08-19 21:34:21 +10:00
Skud
3c1b464bd9
don't show seeds if there aren't any
2013-08-19 20:58:25 +10:00
Skud
ffdb881d5a
Update interesting_plantings when photos added/removed
2013-08-19 20:57:59 +10:00
Skud
68cdb2b50c
moved model access from controller to views to help caching
2013-08-19 20:35:00 +10:00
Skud
ccd0f9c46a
got rid of last remnants of direct cache access
2013-08-19 18:15:14 +10:00
Skud
f0e3c88bd8
Break out interesting? into its own method
2013-08-19 18:09:39 +10:00
Skud
8c78651d05
Break out interesting? into its own method
2013-08-19 18:00:23 +10:00
