11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	9b3c77a0e6	More DRY comments controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	b5636af3be	Add responders to alternate names controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	3e93fb5e2e	Add responders on products controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	c22c92e9f4	Validates min price on product ... the database has this constraint already. Adding so the ruby models match.	2017-05-29 16:17:43 +12:00
Brenda Wallace	97a763660a	DRY the products controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	8a25ecc635	DRY the roles controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	ee52c14b95	Put rubocop word array settings back	2017-05-29 16:17:43 +12:00
Brenda Wallace	3178e44843	DRY some of the places_controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	f510dfd8d9	Removed fixed issues from rubocop_todo	2017-05-29 16:17:43 +12:00
Brenda Wallace	7ad13d3eff	Don't restrict crop search to approved	2017-05-29 16:17:43 +12:00
Brenda Wallace	e0c7e8c15b	Removed route comments and extras on plant_parts controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	5e91effb12	More DRY the plant_parts controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	9560da90ab	Add Scientific names to the menu	2017-05-29 16:17:43 +12:00
Brenda Wallace	9e1ed8e9eb	add flash responders to plants parts controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	15592d01d0	Small dry of plant_parts controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	15d93e6c33	Move includes(:photos) before pagination	2017-05-29 16:17:43 +12:00
Brenda Wallace	484e20ba83	Don't attempt to create blank altnames or scinames	2017-05-29 16:17:43 +12:00
Brenda Wallace	d341e977c3	Fix up check of pending crops in view	2017-05-29 16:17:43 +12:00
Brenda Wallace	e7d7ee396e	Further DRY of saving crops	2017-05-29 16:17:43 +12:00
Brenda Wallace	adf585852a	Revert "Wikipedia url is always required" ... This reverts commit ba5ad00f5c.	2017-05-29 16:17:43 +12:00
Brenda Wallace	de5b56235e	Small style change to reduce size of crops#show	2017-05-29 16:17:43 +12:00
Brenda Wallace	318ef46ae8	crops pending approval, fetched in one method (DRY)	2017-05-29 16:17:43 +12:00
Brenda Wallace	b982793fbf	Wikipedia url is always required ... The form says it's required, so it should be required.	2017-05-29 16:17:43 +12:00
Brenda Wallace	6fef56ebb7	DRY the crops controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	fa586c15aa	Dry the scientific names controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	51be3db970	Use a guard clasue in shop controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	5d654175a9	A bunch of single line methods	2017-05-29 16:17:43 +12:00
Brenda Wallace	e9003ad32a	Small dry of crops controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	38c3320731	Rubocop fix up in accounts controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	e6b556851a	More DRYing of members controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	a30285ef49	DRY some of the members controller	2017-05-29 16:17:43 +12:00
Brenda Wallace	4f67f17551	DRY the shop controller	2017-05-29 16:17:43 +12:00
Shiny	8f66009d0d	Merge branch 'dev' into issue-1044-account-deletion	2017-05-29 15:56:17 +12:00
Daniel O'Connor	cdd12fd4dd	Merge pull request #1348 from Br3nda/inactive-plantings ... Inactive plantings show as tiny thumbnails	2017-05-29 10:52:37 +09:30
Daniel O'Connor	3ff0018a12	Merge branch 'dev' into inactive-plantings	2017-05-29 09:46:03 +09:30
Daniel O'Connor	0b0f479752	Merge pull request #1346 from Br3nda/bugfix-brokenurl-crop-rss ... Fixed url in crop rss feed	2017-05-29 09:44:04 +09:30
Shiny	b7148b99dc	Merge branch 'dev' into issue-1044-account-deletion	2017-05-28 20:54:02 +12:00
Brenda Wallace	8076e58a97	Owner must exist so we can see photos	2017-05-28 19:32:34 +12:00
Shiny	251d390c23	Merge branch 'dev' into bugfix-brokenurl-crop-rss	2017-05-28 18:52:03 +12:00
Brenda Wallace	f380f222a9	Move edit link to top of card	2017-05-28 18:51:01 +12:00
Brenda Wallace	eacdab45ba	Removed planting.with_dates	2017-05-28 18:44:26 +12:00
Brenda Wallace	dcb949e7b3	Fixed bug - error when planting has no finished_at	2017-05-28 18:10:53 +12:00
Brenda Wallace	ebf1468652	Fix up small haml nexting bug	2017-05-28 18:07:19 +12:00
Brenda Wallace	4726b57c47	Inactive plantings show as tiny thumbnails	2017-05-28 17:13:04 +12:00
deppbot	f422336aff	Bundle Update on 2017-05-28	2017-05-28 14:23:17 +12:00
Brenda Wallace	2c622af49c	Fixed url in crop rss feed	2017-05-27 14:30:24 +12:00
Brenda Wallace	0b684eb05e	Checks owner exists, in default_scopes of many models	2017-05-26 23:00:06 +12:00
Brenda Wallace	9c4a45bc29	Merge remote-tracking branch 'origin/issue-1044-account-deletion' into issue-1044-account-deletion	2017-05-26 21:25:00 +12:00
Brenda Wallace	00f7551c0a	Merge remote-tracking branch 'upstream/dev' into issue-1044-account-deletion	2017-05-26 21:24:41 +12:00
Shiny	ee7b915313	Merge branch 'dev' into issue-1044-account-deletion	2017-05-26 21:24:29 +12:00