mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 20:22:47 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 98 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
814 Commits
Author SHA1 Message Date
Skud 28c789f85c Update to ruby 2.1.1 and various gem tweaks to go with it 2014-04-28 12:33:43 +10:00
Skud 30c1129cab Added route for crop search 2014-01-03 21:28:08 +11:00
pozorvlak 06f1d9cb7e Merge pull request #338 from Skud/crop-mentions 
Crop mentions
 2014-01-02 03:16:40 -08:00
Skud 8620236cb0 Use growstuff markdown everywhere (except policy) 2013-11-11 10:33:20 +11:00
Skud 3a162e9b31 Fixed broken tests for markdown filter 2013-11-08 12:55:47 +11:00
Miles Gould e9a3c0f4ee rails g scaffold PlantPart... 
Also migration to remove the string plant_part.
 2013-10-30 23:32:20 +00:00
Skud 96b5a6cd94 Added new garden fields to gardens/show 2013-10-25 22:48:02 +11:00
Skud 803f8244c9 Added various fields to garden 
- active (default: true)
- location, latitude and longitude (because when you move house, you
    don't take your garden with you)
- area and area units (square feet or metres)
 2013-10-25 21:54:13 +11:00
Skud ebf6034659 Prettified all the harvest views 2013-09-17 17:09:17 +10:00
Skud 37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +10:00
Skud 8f15b30eb7 Merge branch 'master' of heroku.growstuff:growstuff-dev into dev 
Conflicts:
	app/assets/javascripts/places.js.erb
 2013-09-11 18:12:15 +10:00
Skud e7436de1e1 Merge branch 'places3' of github.com:Skud/growstuff into places3 
Conflicts:
	app/assets/javascripts/places.js.erb
 2013-09-11 18:08:46 +10:00
Skud a75ed5090a Hardcode Cloudmade API key. 
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
 2013-09-11 18:03:19 +10:00
Skud 90f3f0e17c still trying to get cloudmade key working (should be reverted later) 2013-09-11 16:35:20 +10:00
Skud af9023f87e Merge pull request #308 from Skud/places3 
Made a config variable for cloudmade_key
 2013-09-10 21:28:44 -07:00
Skud c58a24f851 Made a config variable for cloudmade_key 
(because the assets pipeline doesn't seem to want to deal direct with
ENV variables.)
 2013-09-11 14:26:56 +10:00
Skud b39df447b6 Merge pull request #307 from Skud/places3 
Places - finally fixed?
 2013-09-10 21:00:54 -07: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
Skud 772eec77a7 added routes and controller stuff for crop hierarchy 2013-09-02 11:13:02 +10: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
Skud ffeda3007a added help text/links to planting form 2013-08-30 16:37:59 +10:00
Miles Gould 24f306e8ef Set User-Agent in Geocoder requests; delete custom nominatim lib. 
Nominatim-the-service's license requires that we identify ourselves.
The custom nominatim lib is no longer required since Geocoder is now
Fast Enough.
 2013-08-28 12:08:19 +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 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
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 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 8f7becfa78 added a basic crop wrangler homepage 2013-08-21 21:24:22 +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
Skud 5d3a44ae0c cache stats and member thumbnails on homepage 2013-08-14 11:47:09 +10:00
Skud 5cc1ab2ab5 switched geocoding from google to openstreetmaps 2013-08-12 13:00:54 +10:00
Joseph Caudle a43d3a1ce7 Add places pages 
This commit builds off of @Skud's spike on locations and largely takes
off from the `nearby_members` feature which previously existed on
members.

One thing to note is that we needed to add a search route and action to
`PlacesController` to account for requests of new places as they could
not be redirected to properly from within `PlacesController#show`.

[Story #53848631]
 2013-08-02 00:15:51 -04:00
Skud 7c6d7ba3a9 rearranged routing to avoid ?owner_id=99 2013-07-26 15:29:30 +10:00
Skud cc711a0a48 prettified seed-related views 2013-07-15 22:53:30 +10:00
Skud b27e1d4db3 let's not use nested resources (yet) 2013-07-15 22:53:30 +10:00
Skud 91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00
Skud 8314851a8e fixed c&p error in database.yml 2013-07-08 11:05:46 +10:00
Skud c17ef8e566 attempt to get travis to test on psql not sqlite 2013-07-08 10:59:31 +10:00
Skud 067fd27837 Merge pull request #238 from pozorvlak/exclude-staff-from-members 
Exclude staff from list of interesting members
 2013-07-03 16:58:13 -07:00
Lucy 650f24099d Added default account type of "Free" in config/applications.rb 2013-07-03 11:04:42 +01:00
Skud 9f65aad5c6 prettified some of the error messages 2013-07-03 13:06:57 +10:00
Skud 2ecbd8315d bugfix: don't say 'not yet set' in planting form 
PT: https://www.pivotaltracker.com/story/show/51457917

Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.

I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
 2013-06-11 16:08:02 +10:00
Skud e3ef27e401 turn caching off again in dev 2013-06-07 18:20:45 +10:00
Skud 903f0c808c cache recent_posts and recent_plantings partials 2013-06-07 17:52:31 +10:00
Skud 89a5a777e6 Merge branch 'dev' into payments-new 
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
 2013-06-04 19:42:00 +10:00
Miles Gould 20eeec43ca Merge branch 'dev' into photos 
Conflicts:
	db/schema.rb
 2013-05-31 11:24:19 +01:00