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

234 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
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
Skud
347be0633b cache posts/forums on homepage 2013-08-20 18:59:13 +10:00
Skud
ffdb881d5a Update interesting_plantings when photos added/removed 2013-08-19 20:57:59 +10:00
Skud
68cdb2b50c moved model access from controller to views to help caching 2013-08-19 20:35:00 +10:00
Skud
b2ab29397e Cache interesting seeds fragment for homepage. 
(refresh cache if any of them are deleted)
 2013-08-19 17:59:10 +10:00
Skud
f0d4ec2690 cache crop image with popover 2013-08-14 12:15:53 +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
5d3a44ae0c cache stats and member thumbnails on homepage 2013-08-14 11:47:09 +10:00
Skud
e54697189f look up nominatim directly 2013-08-13 12:31:19 +10:00
Skud
5cc1ab2ab5 switched geocoding from google to openstreetmaps 2013-08-12 13:00:54 +10:00
Skud
d30f8e443e added popovers, added map on places/show page 2013-08-12 12:36:09 +10:00
Skud
0d4b2946e9 Fixed up all home/partials tests, now passing 2013-08-09 14:29:17 +10:00
Skud
7d56cf57a1 got tests passing again, post homepage redesign 2013-08-09 10:18:21 +10:00
Skud
ee39156036 Only interesting (locatable) seeds are shown on homepage 2013-08-07 16:25:38 +10:00
Skud
749a9b8fdc Added seeds and people to homepage 2013-08-07 13:21:27 +10:00
Skud
b27d3d8385 roughly got crops/plantings working for new homepage 2013-08-07 13:21:26 +10:00
Skud
382f77e0c2 Merge pull request #267 from Skud/api-review 
Review and cleanup of JSON API
 2013-08-06 19:58:51 -07:00
Skud
a3b7822268 Review and cleanup of JSON API 
Removed JSON from classes that shouldn't have it.
(PT: https://www.pivotaltracker.com/story/show/54570954)

Also found a couple of controllers with broken authorization (i.e. not
checking CanCan). Incidentally, this also fixes the comment form bug at
https://www.pivotaltracker.com/story/show/54328716.
 2013-08-05 13:29:07 +10:00
Skud
fa0d818fd9 added metadata to plantings RSS 2013-08-05 12:05:06 +10:00
Skud
128c76bca3 added RSS feed for seeds 2013-08-05 12:04:45 +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
ac684dd8ae add author choice to posts page 2013-07-26 14:55:47 +10:00
Skud
ebb8765583 make gardens page look like plantings/seeds 2013-07-26 14:48:55 +10:00
Skud
e2754a94d9 added pagination to seed and planting index pages 2013-07-26 14:36:12 +10:00
Skud
1ac5683557 display plantings in table form, like seeds 2013-07-26 14:22:49 +10:00
Skud
e17f5d6599 Merge pull request #255 from Skud/photo_set 
Photo set
 2013-07-23 03:47:36 -07:00
Miles Gould
96e66cd9bb New photo: show an h2 with the name of the current set 
Also don't show a sets dropdown if the user has no sets.
 2013-07-18 14:45:36 +01:00
Miles Gould
2b863cd62e Fix problem adding photos from photosets. 
When we fetched photos from a photoset, the response object didn't
respond to to_a, breaking our controller code. This turned out to be due
to weirdness in FlickRaw's API:
https://github.com/hanklords/flickraw/issues/58
 2013-07-18 14:16:22 +01:00
Ryan Clark
6729a8a28c Pass set to member.flickr_photos - broken\! 2013-07-16 18:52:13 -07:00
Ryan Clark
106c3a74ba Display a set dropdown on the new photo page. 2013-07-16 18:27:06 -07:00
Skud
491e97c997 connected seeds into other parts of the site 2013-07-15 23:29:14 +10:00
Skud
91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00