Commit Graph

1008 Commits

Author SHA1 Message Date
Brenda
bdee705b55 Update with frozen literals 2019-12-26 13:38:17 +13:00
Brenda Wallace
9c2beb304f show days of progress (#2344)
* show days of progress
* Update planting model spec to use age_in_days
2019-12-21 16:49:43 +13:00
Brenda Wallace
04fd1a343a Rubocop update (#2334)
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
2019-12-16 22:35:33 +13:00
codefactor-io
22d7bd6a4e [CodeFactor] Apply fixes 2019-12-15 02:58:12 +00:00
Brenda
a91a2c6ea5 Add ElasticSearch mappings, to fix intermittent errors 2019-12-15 15:56:22 +13:00
Brenda Wallace
91b399196a Cache some heavy queries on models 2019-12-14 14:03:01 +13:00
Brenda Wallace
7c38f7eca6 Pull homepage data directly from elasticsearch (#2316)
* Pull homepage data directly from elasticsearch

* Removing non-elasticsearch options

* [CodeFactor] Apply fixes to commit c46b2e7
2019-12-09 10:03:48 +13:00
Brenda Wallace
f4484cf376 Don't cache photo do agressively 2019-12-04 21:02:33 +13:00
Brenda
c42fb5df51 Tell default photo to expire in 1 hour 2019-12-04 21:02:33 +13:00
Brenda
56cb291508 Little bit less queries to look up sci name 2019-12-04 21:02:33 +13:00
Brenda Wallace
d22fb68eee Cache photos 2019-12-04 20:59:56 +13:00
Brenda Wallace
6325df25b8 Make the month an int 2019-11-24 11:36:55 +13:00
Brenda Wallace
83f0182551 rubocop lint 2019-11-24 10:41:20 +13:00
Brenda Wallace
554adf234e Allow chaining on Harvest predictions method returns 2019-11-24 10:30:56 +13:00
Brenda Wallace
a8a522d09e rubocop style fix 2019-11-24 10:17:55 +13:00
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
Brenda Wallace
70565c7202 show neighbouring plantings same crop
also helps see where the prediction came from
2019-11-24 09:43:25 +13:00
Brenda Wallace
09a70c4742 Predict month of harvest on perennials 2019-11-23 22:21:36 +13:00
Brenda Wallace
df5b0499e4 Update spec for api resource 2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff Added plantings to places map 2019-11-16 12:16:18 +13:00
Brenda Wallace
b8b579a5ba rubycop fix up 2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347 [CodeFactor] Apply fixes to commit a651f07 2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8 Simplify garden.name validation regexp 2019-11-11 17:41:46 +13:00
Brenda Wallace
cfaa18daaf Merge remote-tracking branch 'upstream/dev' into UTFGardenNames 2019-11-11 14:14:34 +13:00
Brenda Wallace
1a0e30491f Removed unused methods 2019-10-24 19:04:37 +13:00
Brenda Wallace
6d6d1930d1 Merge branch 'dev' into planting-reminders 2019-10-21 15:53:25 +13:00
Brenda Wallace
94452ee62e polish up the plantings reminders 2019-10-20 14:12:34 +13:00
Brenda Wallace
21848bf5b4 Merge branch 'dev' into role-admin 2019-10-19 09:42:49 +13:00
Brenda Wallace
fd39d6ef8c More per page 2019-10-08 15:54:53 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200)
* Inline editing and display tidy ups
2019-10-08 11:06:53 +13:00
Brenda Wallace
3422a0d899 Administer member's roles 2019-10-06 14:19:39 +13:00
Brenda Wallace
f297fdc677 Inline editing and display tidy ups 2019-10-05 20:58:00 +13:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177)
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
2019-09-28 17:23:25 +12:00
Brenda Wallace
6a4158ae04 👭 Crop companions (#2176)
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
2019-09-28 10:38:01 +12:00
Brenda Wallace
9c0c0eeb18 Merge branch 'dev' into post-comments 2019-09-27 08:13:33 +12:00
Brenda Wallace
66a3b2c52b If we delete a photo, delete the associations records 2019-09-27 08:13:07 +12:00
Brenda Wallace
99e2ca4920 If a crop is deleted, delete association (gerund) records too 2019-09-27 08:13:07 +12:00
Brenda Wallace
719fec24d0 if someone is destroy, delete all likes 2019-09-27 08:13:07 +12:00
Brenda Wallace
685fddb2be Merge remote-tracking branch 'origin/post-comments' into post-comments 2019-09-26 21:14:53 +12:00
Brenda Wallace
7acdc6c96f Merge remote-tracking branch 'upstream/dev' into post-comments
Conflicts:
	db/schema.rb
2019-09-26 21:14:12 +12:00
Brenda Wallace
fab9560c46 Apply suggestions from code review 2019-09-22 13:22:02 +12:00
Brenda Wallace
90035e79b8 Crop to post relationship made more rails standard 2019-09-22 10:07:50 +12:00
Brenda Wallace
b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00
Brenda Wallace
5ded29ef7c Allow anyone to view followers - and tidy up display
fixes #2106
2019-08-31 14:25:31 +12:00
Brenda Wallace
777408a6dc Merge branch 'dev' into UTFGardenNames 2019-08-29 13:53:04 +12:00
Brenda Wallace
c173d359d8 Split up giant member model 2019-08-12 10:00:21 +12:00
Brenda Wallace
df87a79ab6 Only send email if user wants them 2019-08-12 09:40:53 +12:00
Brenda Wallace
e01b53fd9b Remove extra validators on notification
We are migrating away from here
2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a Reducing size of member model 2019-08-11 15:50:48 +12:00
Brenda Wallace
031734bb7f shorten method 2019-08-11 14:24:43 +12:00