Commit Graph

902 Commits

Author SHA1 Message Date
Brenda Wallace
1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace
ccb69c5f7d Style/lint tidy up models 2019-04-08 21:59:26 +12:00
Brenda Wallace
302e19776f code style fix up 2019-04-08 21:39:20 +12:00
Brenda Wallace
77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
ca743e421d Add matching ES methods for when no elastic search configured 2019-04-08 21:39:20 +12:00
Brenda Wallace
f3ae1a8ec3 Fix dangerous sql warning 2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a Add default pagination to crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
61e0c2eb1d Swap elasticssearch for searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace
e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
Brenda Wallace
5d32bc8010 don't allow spaces in slug 2019-03-26 22:07:47 +13:00
Brenda Wallace
55f6636da5 change "required" to "optional" 2019-03-26 22:06:41 +13:00
Brenda Wallace
48022fb541 nullify gardens.garden_type when garden_type is destroyed 2019-03-26 21:18:14 +13:00
Brenda Wallace
cc88f5c6c7 Update subtitler 2019-03-26 21:11:25 +13:00
Brenda Wallace
721a8694a0 Removing plots 2019-03-26 21:09:26 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +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
b61c2290be Removed unnecesary helper wrapper 2019-02-04 22:15:18 +13:00
Brenda Wallace
6a1954b1e7 added dependent: destroy 2019-02-04 21:22:19 +13:00
Brenda Wallace
f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace
ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace
e8ac207fa7 Save the crop on the photo association 2019-02-04 20:32:11 +13:00
Brenda Wallace
a9ca12c1c5 Method to find planting photos only 2019-02-04 19:39:44 +13:00
Brenda Wallace
e3a0de081e Merge branch 'dev' into photos/seeds 2019-01-30 16:46:42 +13:00
Brenda Wallace
8c03e3f4ab Merge branch 'dev' into bb-track-types-of-gardens 2019-01-30 16:45:14 +13:00
Brenda Wallace
6273fa684c Models (plot and container) need to sub class ApplicationRecord 2019-01-18 14:34:47 +13:00
Brandon Baker
a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace
1660629cf9 DRY crop.interesting? 2019-01-06 08:45:42 +13:00
Brenda Wallace
106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace
ffb87a4432 Validators of garden name uniquness, and slug name 2019-01-06 08:45:42 +13:00
Brenda Wallace
c969a9f830 Use slug, not member name, for urls to members 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
b13ddf9c92 Add photos of seeds 2019-01-04 22:21:48 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brandon Baker
178c6cd944 fixes bug in setting slug on container 2018-12-06 15:51:00 -07:00
Brandon Baker
bb97082868 adds friendly_id to containers 2018-12-01 19:46:49 -07:00
Brandon Baker
f35284c403 adds more basic specs 2018-12-01 14:08:11 -07:00
Brandon Baker
02174a0acb builds views for containers 2018-11-30 11:56:58 -07:00
Brandon Baker
5f6852b45c adds basic specs for container and adds a plot spec for garden 2018-11-29 13:22:35 -07:00
Brandon Baker
c898a958a5 adds container to garden form 2018-11-29 12:51:15 -07:00
Brandon Baker
45ba5ff48a creates containers, plots, and associations among gardens, plots, and containers 2018-11-29 10:54:04 -07:00
Brenda Wallace
510124758d Inverse relation ships 2018-10-16 13:26:54 +13:00
Brenda Wallace
de2175ce16 More inverse relationships defined 2018-10-16 13:20:03 +13:00
Brenda Wallace
0d3588a2b2 Add another inverse_of created_alternate_names 2018-10-16 12:47:05 +13:00
Brenda Wallace
c1dabfc3d3 Typo fix, requestd_crops to requested_crops 2018-10-16 12:42:49 +13:00
Brenda Wallace
fc0a941fb6 Adding more inverse relationships 2018-10-16 11:32:03 +13:00
Brenda Wallace
6c2afb2804 Adding missing inverswe relationship alternatename.creator 2018-10-16 10:16:45 +13:00