Brenda Wallace
e322c863b2
Removed unused arg to dbsearch
2019-04-13 10:20:33 +12:00
Brenda Wallace
174f54cb75
Linting
2019-04-13 10:13:36 +12:00
Brenda Wallace
347d751935
More plurals and misspellings in search specs
2019-04-13 10:03:18 +12:00
Brenda Wallace
fa1913c8b6
Split a method to reduce the complexity
2019-04-13 09:50:36 +12:00
Brenda Wallace
9683983f23
Merge branch 'dev' into feature/searchkick
2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499
varieties info on crops#show ( #1848 )
...
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
2019-04-10 20:02:05 +12:00
Brenda Wallace
bd1a1c53f4
Removed unneeded rubocop disable
2019-04-08 21:59:44 +12:00
Brenda Wallace
ccb69c5f7d
Style/lint tidy up models
2019-04-08 21:59:26 +12:00
Brenda Wallace
e165c77d64
Force autocomplete to json format
2019-04-08 21:39:20 +12:00
Brenda Wallace
74e6a7cf2f
Rename @matches to @crops
2019-04-08 21:39:20 +12:00
Brenda Wallace
302e19776f
code style fix up
2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41
Working without elastic search too
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
789cffeca1
Eager loading
2019-04-08 21:39:20 +12:00
Brenda Wallace
150d44ad6f
named arguments for search
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
1e240cf4b8
replace a rubocop ignore
2019-03-26 22:12:09 +13:00
Brenda Wallace
2d2304d8c0
Rubocop lint
2019-03-26 22:07:54 +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
b446e44ac0
Moved garden types to admin menu
2019-03-26 21:02:48 +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
db5bdab055
Set planting.finished as a boolean
2019-03-20 09:43:01 +13:00
Brenda Wallace
37693e8d12
Add filters for the members api
2019-03-20 09:43:01 +13:00
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
1441850cd6
Merge branch 'dev' into photos/seeds
2019-02-13 13:59:14 +13:00
Brenda Wallace
3722672869
Merge branch 'dev' into photos/seeds
2019-02-13 09:06:42 +13:00
Brenda Wallace
fa00262f80
Merge branch 'dev' into crops-show
2019-02-13 09:04:51 +13:00
Brenda Wallace
bd86f7372e
Merge branch 'dev' into garden-overview
2019-02-12 21:50:51 +13:00
Brenda Wallace
f57a423c29
Merge branch 'dev' into crops-show
2019-02-12 21:50:05 +13:00
Brenda Wallace
5930334bd6
Merge branch 'dev' into photos/seeds
2019-02-12 21:49:43 +13:00
ImgBotApp
94403ab5a6
[ImgBot] Optimize images
...
*Total -- 299.13kb -> 245.06kb (18.08%)
/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
2019-02-12 21:49:11 +13:00
Brenda Wallace
80f0f41026
removed commented out code
2019-02-12 11:51:16 +13:00
Brenda Wallace
1dfad812a1
Javascript lint
2019-02-12 11:41:40 +13:00
Brenda Wallace
7a4121bf3f
Added missing semicolon
2019-02-12 11:41:33 +13:00
Brenda Wallace
fb6a270fa6
Tidy up crop predictions display
2019-02-10 21:51:06 +13:00
Brenda Wallace
572af9d135
Merge branch 'dev' into photos/seeds
2019-02-09 17:00:58 +13:00
Brenda Wallace
93835b3ee6
Javascript lint
2019-02-09 15:21:30 +13:00
Brenda Wallace
63b8554435
Added missing semicolon
2019-02-09 15:16:53 +13:00
Brenda Wallace
18d7ae2953
Further tidy up of the planting quick action buttons
2019-02-09 14:24:51 +13:00
Brenda Wallace
ec4b443d8c
Tool tips
2019-02-09 14:13:07 +13:00
Brenda Wallace
50751611fa
Tidy up where badges appear
2019-02-09 14:12:45 +13:00
