mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-08 22:23:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,131 Commits 66 Branches 92 Tags
c04fba2cd6777533a48af5e26ca10fc14ed01831
Commit Graph
815 Commits
Author SHA1 Message Date
Brenda Wallace 0c868d3edb Merge branch 'dev' into photos/seeds 2019-02-16 12:37:53 +13:00
Brenda Wallace d3a542727c Fixing crop deleting and adding tests 2019-02-15 08:45:18 +13:00
Brenda Wallace e446c14bd7 Use the new Photo.by_cropscope on photos controller 2019-02-05 12:44:34 +13:00
Brenda Wallace 6167af700d Rubocop lint tidy 2019-02-05 12:37:09 +13:00
Brenda Wallace 9c4e649c5d Split up photos on crops#show by model type 2019-02-05 12:31:59 +13:00
Brenda Wallace f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace 5822764c1d Fetch photos in the controller 2019-02-04 20:52:13 +13:00
Brenda Wallace ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace 87d2c8b4c8 Fixed bug - look up photos by crop 2019-02-04 19:39:21 +13:00
Brenda Wallace b35d13d5e5 Update seeds_controller.rb 2019-01-18 20:05:41 +13:00
Brenda Wallace d1a3f41462 Throw if can't find the @crop 2019-01-18 20:04:19 +13:00
Brenda Wallace 3212f748b4 Update crops_controller.rb 2019-01-18 20:03:22 +13:00
Brenda Wallace cb6a06feb6 find by slug 2019-01-18 20:02:15 +13:00
Brenda Wallace 8cb9361462 only look up member/crop if an slug is passed 2019-01-06 08:45:42 +13:00
Brenda Wallace c0e957b051 Places params is :place 2019-01-06 08:45:42 +13:00
Brenda Wallace 4587dc711f Use to_param to make parts of the csv filename 2019-01-06 08:45:42 +13:00
Brenda Wallace 061bd31220 Use owner param in filename 2019-01-06 08:45:42 +13:00
Brenda Wallace df7a59c629 Use slug in filename, not name/login_name 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e6c204df2 Rubcop fix up 2019-01-06 08:45:42 +13:00
Brenda Wallace 62a8f6b8d3 Fixed look up of reply notification 2019-01-06 08:45:42 +13:00
Brenda Wallace e8d2226ac6 Look up crop by slug 2019-01-06 08:45:42 +13:00
Brenda Wallace b44b7fdd2e Move follows from members controller to follows controller 2019-01-06 08:45:42 +13:00
Brenda Wallace 59bc036565 Follow/Unfollow updated for routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 07f06705af Fixed pi charts path 2019-01-06 08:45:42 +13:00
Brenda Wallace b2bceb5873 Fixed planting display by crop 2019-01-06 08:45:42 +13:00
Brenda Wallace e313a7160f Active plantings option on plantings#index 2019-01-06 08:45:42 +13:00
Brenda Wallace 1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace 387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace 99a69bf192 Tidy up places routes 2019-01-06 08:45:42 +13:00
Brenda Wallace 68953188f8 Update to new path names 2019-01-06 08:45:42 +13:00
Brenda Wallace f4df42d136 Fixes not being able to find the 404 page file 2019-01-01 13:42:53 +13:00
Brenda Wallace 2faa2fd6f0 Content for other formats on photos#show 2018-12-30 15:42:51 +13:00
Brenda Wallace 98e492ad11 DRY 2018-12-30 15:33:10 +13:00
Brenda Wallace 468dded162 Remove controller actions for method that don't exist 2018-12-30 15:32:59 +13:00
Brenda Wallace 7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace 7399346354 one line method 2018-12-30 15:18:11 +13:00
Brenda Wallace 914e9ef3be photos needs a show method 2018-12-30 15:05:10 +13:00
Brenda Wallace 8e160a4c93 Fixed another wrong method name 2018-12-30 15:05:00 +13:00
Brenda Wallace 24b58c5ac2 FIXED wrong method name 2018-12-30 15:04:50 +13:00
Brenda Wallace b82b4fa642 Comments controller has no show 2018-12-30 15:04:38 +13:00
Brenda Wallace 3ad048b7e8 Fixed linter issue, empty line after guard clause 2018-09-13 23:10:43 +12:00
Brenda Wallace 550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
robotscissors dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07:00
Brenda Wallace 05bfbda5f5 Rubocop style fix ups 2018-06-04 16:18:49 +12:00
Brenda Wallace a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +12:00
Brenda Wallace a221f10113 Move photos owner validation to models 2018-06-04 12:03:11 +12:00
Brenda Wallace b898d83d21 Fix up notification redirect spec 2018-06-04 11:49:30 +12:00
Brenda Wallace cc838e19b5 Show a 404 page on record not found 2018-06-04 10:59:34 +12:00
Brenda Wallace cd910e74bc Don't need to throw exception on planting save error 2018-04-28 22:05:50 +12:00
Brenda Wallace f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00