mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-18 22:58:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,311 Commits 70 Branches 76 Tags
67ed1e2170e7e7ee252c6510e85f475360466a20
Commit Graph

584 Commits

Author SHA1 Message Date
Miles Gould
4701bd1b2e Merge branch 'dev' into places2 
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
 2013-08-31 15:49:30 +01:00
Miles Gould
d9cb1cba89 Merge branch 'bulb' into dev 2013-08-30 12:01:43 +01:00
Skud
ffeda3007a added help text/links to planting form 2013-08-30 16:37:59 +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
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
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
Miles Gould
bce0fe23c0 Replace string keys with symbols in Nominatim spec. 
We're using symbol keys in the actual code, and hence should probably
use test data of the same format.
 2013-08-23 17:19:20 +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
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
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
Skud
3e84d47c90 fixed bug with tradable_to reverting to 'nowhere' 2013-08-21 21:57:43 +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
b913ca7a19 tiny test fixes to bring things up to date with reality 2013-08-20 14:48:17 +10:00
Skud
68cdb2b50c moved model access from controller to views to help caching 2013-08-19 20:35:00 +10:00
Skud
3d19772515 Fixed some broken tests for displaying member location 2013-08-19 17:59:40 +10:00
Skud
e8cb5e89b6 Changed interesting methods to always return 12 
... because it makes the caching more effective.  Use .first(n) to get a
smaller number if you want it.
 2013-08-14 11:58:54 +10:00
Skud
afc57db8d3 Added links to places pages 
Committing with broken tests and pushing to github just so people can
take a look at what we're doing.
 2013-08-12 13:38:20 +10:00
Skud
be9bc4ba4d added 'Places' to top nav 2013-08-12 10:48:06 +10:00
Skud
32f2830df5 changed located scope to ignore blank lat/long 2013-08-12 10:46:35 +10:00
Skud
1a764877a7 added signin link to green call to action box 2013-08-09 14:36:51 +10:00
Skud
0d4b2946e9 Fixed up all home/partials tests, now passing 2013-08-09 14:29:17 +10:00
Skud
fc0d883eab Added tests for home/seeds partial 2013-08-09 14:19:40 +10:00
Skud
70e2e2a6a8 Added tests for home/members partial 2013-08-09 14:16:28 +10:00
Skud
925e8d5d6a Added tests for home/open partial 2013-08-09 13:33:21 +10:00
Skud
7bba2b9e2c Added tests for "keep in touch" partial 2013-08-09 13:29:43 +10:00
Skud
0eafaf6311 Added tests for home/stats partial 2013-08-09 13:26:32 +10:00
Skud
c69221cc7b Wrote tests for crops partial 2013-08-09 13:06:59 +10:00
martyhines
07efe0dc8d Added bio to the member profile 2013-08-08 22:18:18 -04:00
martyhines
0d5b2bbcce Added bio to member model 2013-08-08 21:38:01 -04:00
Skud
7d56cf57a1 got tests passing again, post homepage redesign 2013-08-09 10:18:21 +10:00
Skud
d5d004306b randomise crops on homepage 2013-08-07 16:33:39 +10:00
Skud
0e401c907e Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:26:51 +10:00
Skud
937ef36b6d don't count empty strings as interesting locations 2013-08-07 16:26:41 +10:00
Skud
ee39156036 Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:25:38 +10:00