Commit Graph
13034 Commits
Author SHA1 Message Date
Brenda Wallace 08996c4157 removed members#destroy. this should be on the registrations controller 2017-06-02 20:48:43 +12:00
Brenda Wallace c48e24845e Remove owner_exists scope 2017-06-02 20:28:32 +12:00
Cesy Avon 61f93df6ff Feature specs for member deletion 2017-06-02 19:48:59 +12:00
deppbot 34e5e0850d Bundle Update on 2017-05-31 2017-05-31 18:27:23 +12:00
Shiny 7621da7041 Merge branch 'dev' into issue-1044-account-deletion 2017-05-30 20:39:44 +12:00
Brenda Wallace 8bcc5104e5 Delegate planting predictions 2017-05-29 22:45:14 +12:00
Brenda Wallace 4bbeca9f3e only look up other plantings finishing, if we have a crop 2017-05-29 22:45:14 +12:00
Brenda Wallace 54748ac20d Removed current_date variable from planting_predictions 2017-05-29 22:45:14 +12:00
Brenda Wallace 3c8b80574a Small DRY of planting models -> predict added 2017-05-29 22:45:14 +12:00
Brenda Wallace 288ad782d2 Planted? = true when planted today 2017-05-29 22:45:14 +12:00
Brenda Wallace 5d97a7edac Move setting of days_before_maturity back to plant model 2017-05-29 22:45:14 +12:00
Brenda Wallace ff1c835cda Moving the planting predictions to own service 2017-05-29 22:45:14 +12:00
Daniel O'Connor 479f61b224 Merge pull request #1352 from Br3nda/admin-typo
Fixed admin typo
2017-05-29 19:18:59 +09:30
Brenda Wallace ac94b8b6d3 Fixed admin typo 2017-05-29 17:52:08 +12:00
Shiny fedc7a7fb6 Merge branch 'dev' into issue-1044-account-deletion 2017-05-29 16:17:59 +12:00
Brenda Wallace 9f9df07390 DRY photos controller more 2017-05-29 16:17:43 +12:00
Brenda Wallace e5a705aeae Responders on the roles controller 2017-05-29 16:17:43 +12:00
Brenda Wallace fb0f74c4d8 Changed location we direct to after garden destroy 2017-05-29 16:17:43 +12:00
Brenda Wallace 963aafd5ab Added missing respond_with to crops controller
This tells rails what to use in json responses
2017-05-29 16:17:43 +12:00
Brenda Wallace efe2f49e7f More DRY Harvests controller 2017-05-29 16:17:43 +12:00
Brenda Wallace a7178b6da7 changed spec to expect responder gem flash 2017-05-29 16:17:43 +12:00
Brenda Wallace 2da3cd6673 Fixed location to redirect to afver comment add/update 2017-05-29 16:17:43 +12:00
Brenda Wallace 5d50f9aec2 DRY the admin controller 2017-05-29 16:17:43 +12:00
Brenda Wallace cfb43ba07c DRY the homes controller 2017-05-29 16:17:43 +12:00
Brenda Wallace 3811417d70 More DRY comments controller 2017-05-29 16:17:43 +12:00
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