mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 18:31:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,317 Commits 57 Branches 82 Tags
7d5643e30df73fb91d0da52b94e00a3af769eb0e
Commit Graph

146 Commits

Author SHA1 Message Date
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
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
Skud
08c3ec7dec Vendored the activemerchant gem to help with testing 
We needed a bogus paypal gateway as per
http://infotrope.net/2013/05/31/testing-paypal-express-with-activemerchants-bogusgateway-and-how-to-make-it-work/

Tests now pass usefully.
 2013-05-31 12:15:23 +10:00
Skud
cbca8c19a5 added admin controller and index view 2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee added admin controller and index view 2013-05-29 14:37:42 +10:00
Skud
5e678d1dbd default test paypal gateway details to 'dummy' or it fails 2013-05-29 13:22:17 +10:00
Skud
89b62e18df Roughly got Paypal working, after much messing around. 
Still need more tests for the orders_controller, and to store the token
when it's returned.
 2013-05-28 16:37:44 +10:00
Skud
dd556d8638 Merge branch 'dev' into payments-new 2013-05-28 14:07:53 +10:00
Skud
3aaf344951 rename account details to just account 2013-05-18 10:50:36 +10:00
Skud
c595b2181d added account_types, fixed a bunch of tests 2013-05-17 16:07:46 +10:00
Skud
0157229936 added account_details table, set up abilities 
also tweaked some order/order_item related abilities
 2013-05-17 13:05:46 +10:00
Skud
7551b7b0d4 added order completion (very basic for now) 2013-05-17 11:28:04 +10:00
Miles Gould
6b487ab1f6 Escaped_Markdown HAML filter, for use in RSS. 
I tried to do this using Haml::Filters::Markdown so it would be
independent of our Markdown renderer, but I couldn't get
Haml::Filters::Markdown.render to work programmatically - whatever I
did, it returned its input unchanged. So I hardcoded a dependence on
bluecloth.
 2013-05-16 15:08:50 +01:00
Skud
7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00
Skud
5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
Skud
5c96bf1541 added basic index page for shop 2013-05-08 15:05:38 +10:00
Skud
42ea14a8e5 added shop page at /shop 2013-05-08 14:02:33 +10:00
Skud
245115fd7f rails g scaffold Order... 2013-05-07 21:14:08 +10:00
Skud
cad5f453fa rails g scaffold Product... 2013-05-07 20:56:10 +10:00
Skud
d006854a6c added omniauth-flickr gem 2013-04-30 22:55:40 +10:00