mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 11:44:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 97 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 42e3b5e04e 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:16:38 +10:00
Skud 73b7897c28 Added rake task to update planting owner 
(using planting.garden.owner)
 2013-08-26 12:28:01 +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
Skud fa93293ed8 Merge pull request #293 from pozorvlak/rake_dependency 
Make "rake" depend on "rake db:test:prepare".
 2013-08-23 17:05:19 -07:00
Miles Gould b31bdbb325 Make "rake" depend on "rake db:test:prepare". 
This also tests for pending migrations.
 2013-08-24 00:00:43 +01: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 ef73e712ba Remove nominatum.rb's dependence on Rails 
The user_agent and user_agent_email are now set as class instance
variables in config/initializers/nominatim.rb.
 2013-08-23 17:00:19 +01:00
Miles Gould aa73a07e5f Add in_testing config option to Nominatum 
Checking against Rails.env.test? fails on Travis.
 2013-08-23 16:37:43 +01: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 251a45a441 Add a User-Agent to Nominatum requests 
- unified repeated config into config/application.rb
 - removed superfluous calls to Growstuff::Application.config
 2013-08-23 14:03:46 +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 95c1f61346 Merge pull request #291 from Skud/location-autocomplete 
Location autocomplete
 2013-08-22 00:47:48 -07: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 7530c84247 Merge pull request #290 from Skud/member-bio 
Member bio
 2013-08-21 21:53:41 -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 83f99dd32e Merge pull request #289 from Growstuff/dev 
Production push: redesigned homepage, JSON API cleanup, RSS improvements, recent activity bugfix
 2013-08-21 18:13:03 -07:00
Skud db901161be Merge pull request #288 from Skud/performance 
Performance
 2013-08-21 17:49:24 -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 bf090dc908 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-22 00:59:47 +10:00
Skud a20f2d35ff Merge branch 'master' of heroku.growstuff:growstuff-dev into dev 2013-08-22 00:45:42 +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
pozorvlak de1e3f11c7 Merge pull request #283 from Skud/recentactivity 
fixed recent activity sorting for posts
 2013-08-21 05:45:13 -07: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
pozorvlak 0fd5cf71a3 Merge pull request #282 from Skud/crop-creator 
Crop creator
 2013-08-21 03:55:57 -07:00
Skud 183acff5f4 populate scientific names creator field 2013-08-21 17:52:33 +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 29908351be die sooner if you can't find cropbot 2013-08-21 17:36:48 +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 eaa8ca0084 set default crop creator (rake task, deploy script, seeds) 2013-08-20 22:30:08 -04:00
martyhines 098595721b Added crop creator to crop edit form 2013-08-20 21:46:22 -04:00