Miles Gould
084bdc4f40
Add friendly URLs to plant parts.
2013-10-31 00:19:48 +00: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
0aa0c38f1f
Removed intentional errors accidentally left in when testing better_errors
2013-10-25 12:34:13 +11:00
Miles Gould
afa0dbcfa9
Turn on better_errors in development.
2013-10-18 11:03:57 +01:00
pozorvlak
bc6adc8840
Merge pull request #324 from Skud/csv
...
CSV data dumps
2013-09-27 08:14:12 -07:00
Skud
c23f27e8b0
Added CSV for seeds
2013-09-25 17:15:42 +10:00
Skud
9cf770a200
Adjusted crops.rss to show most recent
2013-09-25 16:59:28 +10:00
Skud
013234c882
Added CSV for plantings
2013-09-25 16:57:27 +10:00
Skud
9cef31e646
allow per-owner CSV downloads
2013-09-25 16:11:08 +10:00
Skud
92ebf1a43c
Added harvest CSV
2013-09-25 16:02:40 +10:00
Skud
a881ec2250
Merge commit '24255411c9d5907ebb6e8fcb39b6bca1833559d9' into csv
2013-09-25 15:41:47 +10:00
Joseph Caudle
00ef1b03d4
Merge pull request #322 from Skud/harvests
...
Harvests
2013-09-24 16:43:39 -07:00
Skud
2ee11e19e5
removed spurious puts
2013-09-19 10:57:11 +10:00
Skud
e425a3f7f4
added error message if your referral code has invalid chars
2013-09-19 10:57:00 +10:00
Skud
ebf6034659
Prettified all the harvest views
2013-09-17 17:09:17 +10:00
Skud
ccb0e42c95
Prettified harvest form
...
Also renamed "notes" to "description" in database
2013-09-17 16:08:41 +10:00
Skud
67b88e8e18
set cancan abilities for harvests
2013-09-17 15:53:51 +10:00
Skud
37383ba451
rails g scaffold Harvest...
2013-09-17 15:39:25 +10:00
Skud
24255411c9
added dates created/modified to crops csv
2013-09-16 17:04:39 +10:00
Skud
d014343667
A basic implementation of a CSV dump for crops
2013-09-16 15:33:34 +10:00
Skud
1adcedb534
moved admin order search into a model method
2013-09-13 13:38:11 +10:00
Skud
0ce821aacf
added referral_code to order form/checkout code
2013-09-13 13:12:11 +10:00
Skud
35f3ee8948
limit things-to-map to those with locations (duh)
2013-09-11 18:20:43 +10:00
Skud
b39df447b6
Merge pull request #307 from Skud/places3
...
Places - finally fixed?
2013-09-10 21:00:54 -07:00
Skud
80b9285727
reinstate @place instance variable for title
2013-09-11 13:19:51 +10:00
Skud
138318e5f4
Moved searching for nearby members into the model
2013-09-11 13:14:52 +10:00
Skud
7d5643e30d
Sort nearby members by distance
...
Also removed distance/units from the places/show search, since you can
adjust nearness by zooming etc.
At this point the "members near here" stuff at the bottom of the page
exists mostly for accessibility and to give additional detail that we
don't currently show in the popups on the map.
So we're not using distance/units to search for members near here
anymore, but instead are just finding the 30 nearest members to the
specified location, and showing them in order of nearness.
2013-09-11 12:41:01 +10:00
Skud
3cd48f751e
Redid places/show using the all-javascript method.
...
Moved JSON for "what's here?" from members/index to places/index -- we
can improve this later if we want to show things other than members.
2013-09-11 12:14:18 +10:00
Skud
c02772d219
Spike: use pure javascript and JSON API to draw map
2013-09-09 22:15:47 +10: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
995f9b2d60
Display crop hierarchy (recursively!)
2013-09-02 12:01:58 +10: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
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
ca236ce7fd
Improve readability of controllers/places slightly.
2013-08-28 12:24:12 +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
ff2a3cf8b2
Set planting owner automatically in controller
2013-08-26 12:23:41 +10: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
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
238fd0b3ff
don't redirect to homepage after signin
2013-08-21 22:51:40 +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
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
