mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 21:51:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 62 Branches 76 Tags
c76e9ccbf6ff41c192845c723ddc8690a74aede7
Commit Graph

178 Commits

Author SHA1 Message Date
Taylor Griffin
2f67ffd2f8 fix regressions 2015-02-02 00:01:49 +11:00
Mackenzie Morgan
0da121a48d adding test for harvest csv 2015-01-29 22:27:09 -05:00
Mackenzie Morgan
c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Taylor Griffin
acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Skud
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Mackenzie Morgan
ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -04:00
Mackenzie Morgan
7d54ab347f Adding photo functionality to harvests 2014-09-09 19:55:40 -04:00
Marlena Compton
ec25f2ab91 created list of crop wranglers on the crop wranglers page 2014-08-21 20:11:10 -07:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search 
Conflicts:
	spec/models/crop_spec.rb
 2014-04-29 11:16:20 +10:00
Skud
0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud
435cb4aed9 remove annoying scaffold-generated tests 2013-11-06 10:39:19 +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
Miles Gould
9c5b6f6192 Rename Crop.system_name to Crop.name 2013-10-18 11:52:05 +01: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
fef92f0d14 Added tests for admin order controller 2013-09-13 14:19:46 +10:00
Skud
0ce821aacf added referral_code to order form/checkout code 2013-09-13 13:12:11 +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
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
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
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
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
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
Skud
68cdb2b50c moved model access from controller to views to help caching 2013-08-19 20:35:00 +10:00
Skud
7d56cf57a1 got tests passing again, post homepage redesign 2013-08-09 10:18:21 +10: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
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
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
Miles Gould
c977709235 Stop controller tests from connecting to Flickr 
... by stubbing out Member#flickr_sets in a photo_controller test. I
looked at the flickrmocks gem, but it doesn't seem very helpful - it
still requires you to connect to Flickr.
 2013-07-18 13:18:01 +01: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
Skud
923f01cd72 cleaned up boring controller tests 2013-07-08 13:24:26 +10:00
Skud
1ff2211c0f removed boring tests from controllers 
the tests generated by 'rails g scaffold...' are boring and brittle.
they don't actually test anything other than the rails framework, and
they were causing us all kinds of trouble. we've started to blow them
away (and raised a PT chore to remove them from other controllers in due
course).
 2013-07-08 13:09:37 +10:00
Skud
ec80b01c7a cleaning up tests on postgres 
- still trying to make sure we explicitly use a real member, not just
assume there's one with id = 1

- also it looks like the tests for post activity are passing for obscure
reasons on sqlite when they shouldn't be. this is a known bug
(https://www.pivotaltracker.com/story/show/51280861) apparently
invisible to us under sqlite.
 2013-07-08 12:18:51 +10:00
Skud
0508837303 Can't assume we have a member with id = 1 
this works on sqlite but not on postgres (which we now test on, on
travis)
 2013-07-08 12:00:45 +10:00
Miles Gould
0a8aaf0ee6 Create free account type if it doesn't exist; fix tests. 2013-06-26 10:55:19 +01:00