Brenda Wallace 14551b6ec8 Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ...

Conflicts:
	spec/models/crop_spec.rb

2017-12-09 20:59:20 +13:00

..

concerns

Added polymorphic relationship to photos

2017-11-29 20:14:27 +13:00

.gitkeep

Moving development to top level directory

2012-08-23 10:41:00 -07:00

ability.rb

Limited plantings to member's own garden, and approved crops

2017-03-16 15:29:25 +13:00

account_type.rb

Use faker gem, in account types - and add controller specs

2017-11-29 20:59:37 +13:00

account.rb

Rubocop compliance for the account model

2017-01-14 21:11:02 +13:00

alternate_name.rb

Adding validations to sci names and alt names

2017-02-23 15:35:29 +13:00

authentication.rb

implement strong parameters instead of protected attributes

2014-11-18 20:08:54 +11:00

comment.rb

Remote default ordering scopes, and clean up models

2017-11-29 20:59:37 +13:00

crop.rb

Merge branch 'dev' into ordering

2017-12-08 20:20:27 +13:00

csv_importer.rb

Rubocop upgrade (and some style fixes)

2017-12-01 21:07:39 +13:00

follow.rb

Rubocop compliance for the follow model

2017-01-14 20:45:54 +13:00

forum.rb

%i-literals should be delimited by ( and )

2017-11-04 10:29:31 +13:00

garden.rb

Feature plantings need to be ordered

2017-11-29 20:59:37 +13:00

harvest.rb

Crop validation methods can be private

2017-11-29 20:59:37 +13:00

like.rb

Rubocop

2016-12-09 12:06:14 +10:30

member.rb

Delete follows records when a member is deleted

2017-11-29 20:59:37 +13:00

notification.rb

Remote default ordering scopes, and clean up models

2017-11-29 20:59:37 +13:00

order_item.rb

Rubocop compliance for the order_item model

2017-01-14 21:08:47 +13:00

order.rb

Remote default ordering scopes, and clean up models

2017-11-29 20:59:37 +13:00

photo.rb

Simplified the photos controller a bit

2017-11-29 22:13:03 +13:00

photographing.rb

Moved photo.items's item lookup to a class method

2017-11-30 11:23:34 +13:00

plant_part.rb

%i-literals should be delimited by ( and )

2017-11-04 10:29:31 +13:00

planting.rb

A planting's photo is their most recent photo

2017-11-29 20:59:37 +13:00

post.rb

Fixed post ordering

2017-11-29 20:59:37 +13:00

product.rb

Remote default ordering scopes, and clean up models

2017-11-29 20:59:37 +13:00

role.rb

%i-literals should be delimited by ( and )

2017-11-04 10:29:31 +13:00

scientific_name.rb

Adding validations to sci names and alt names

2017-02-23 15:35:29 +13:00

seed.rb

Rubocop upgrade (and some style fixes)

2017-12-01 21:07:39 +13:00