mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-31 05:02:02 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,122 Commits 55 Branches 76 Tags
fc152feebb5190eca583c9bd5a4eef860029bf14
Commit Graph

968 Commits

Author SHA1 Message Date
codefactor-io
877baf22db [CodeFactor] Apply fixes to commit 2313812 2019-12-25 22:00:43 +00:00
Brenda Wallace
2313812272 Removed set_garden 2019-12-26 11:00:21 +13:00
codefactor-io
950dd7f810 [CodeFactor] Apply fixes 2019-12-25 01:27:49 +00:00
Brenda Wallace
673f977efc Photos controller using elastic search 2019-12-25 14:27:13 +13:00
codefactor-io
df97d51940 [CodeFactor] Apply fixes 2019-12-23 22:39:08 +00:00
Brenda Wallace
4a2bb2342c Sorting out cancancan, copied to common parent controller 2019-12-24 11:38:30 +13:00
Brenda Wallace
6f950e685b hand loading back to cancancan 2019-12-24 10:45:02 +13:00
codefactor-io
8fe5e4435b [CodeFactor] Apply fixes 2019-12-22 20:46:53 +00:00
Brenda Wallace
bbaa0436cb ES query doesn't need to be public on the controller 2019-12-23 09:46:11 +13:00
Brenda Wallace
b730378e14 tidy up and fix specs for harvest controller 2019-12-23 09:45:35 +13:00
Brenda Wallace
4cf5daf3b8 gardens charts controller using slug 2019-12-23 09:44:06 +13:00
codefactor-io
f8916dfecb [CodeFactor] Apply fixes 2019-12-20 04:16:33 +00:00
Brenda Wallace
9d68ab0228 Rubocop fix of controller 2019-12-20 17:13:54 +13:00
Brenda Wallace
42f1e61496 controller tidy up 2019-12-20 16:30:58 +13:00
codefactor-io
d95bc774a2 [CodeFactor] Apply fixes 2019-12-20 03:22:04 +00:00
Brenda Wallace
8789fee365 Seeds into elastic search 2019-12-20 16:20:52 +13:00
Brenda Wallace
c0103a3f42 find seeds by slug 2019-12-20 09:21:47 +13:00
Brenda Wallace
95c1ee7a81 Fixed loading gardens 2019-12-19 21:56:16 +13:00
Brenda Wallace
32178e2c3e Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2019-12-19 21:49:37 +13:00
Brenda Wallace
5e5cdf6246 Fixing up lookup by slug 2019-12-19 21:49:18 +13:00
codefactor-io
700d2b4f30 [CodeFactor] Apply fixes to commit 3deafc0 2019-12-19 08:27:22 +00:00
Brenda Wallace
3deafc039d Loading a harvest 2019-12-19 21:26:53 +13:00
codefactor-io
2558cb14f8 [CodeFactor] Apply fixes 2019-12-19 02:00:25 +00:00
Brenda Wallace
38e36c4a2c Merge remote-tracking branch 'upstream/dev' into cache/harvests 
Conflicts:
	.rubocop_todo.yml
	app/controllers/likes_controller.rb
	app/models/concerns/crop_search.rb
	app/services/crop_search_service.rb
 2019-12-19 10:28:17 +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
Brenda Wallace
0b9b94f1d5 Plantings#index using Elastic Search 2019-12-14 13:52:02 +13:00
Brenda Wallace
b343f89997 Photos indexed in elastic search 2019-12-11 11:42:34 +13:00
Brenda Wallace
b44877a63e Using elastic for plantings look ups 2019-12-11 11:38:34 +13:00
codefactor-io
18f016766a [CodeFactor] Apply fixes to commit 282791d 2019-12-09 09:20:19 +00:00
Brenda Wallace
282791d91b Pull crops and harvests from elasticsearch 2019-12-09 22:19:20 +13:00
Brenda
607eae2a43 Small improvements to crops controller to reduce query count 2019-12-04 21:02:33 +13:00
Brenda Wallace
0f73c13622 Merge branch 'dev' into predict-perenial-harvest 2019-11-24 10:40:22 +13:00
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
codefactor-io
a23963ba96 [CodeFactor] Apply fixes 2019-11-23 19:58:22 +00:00
Brenda Wallace
c0fabc7002 Reducing unnecesary and extra queries 2019-11-24 08:57:34 +13:00
Brenda Wallace
a437338961 Fix markers on crops#show map 2019-11-16 11:35:45 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00:00
Brenda Wallace
c6f4eef291 Show more results in searches 2019-10-21 16:24:31 +13:00
Brenda Wallace
abd91fa37b Use bang! to indicate method can explode 2019-10-21 14:43:46 +13:00
Brenda Wallace
47be6ad631 Merge branch 'dev' into role-admin 2019-10-21 14:24:31 +13:00
Brenda Wallace
8c694b3dca Only show companions of active plantings 2019-10-21 14:19:47 +13:00
Brenda Wallace
0965168750 Group previous plantings by year 2019-10-19 11:25:19 +13:00
Brenda Wallace
fc07571ee1 Rename is_admin? to admin?. 2019-10-19 10:25:17 +13:00
Brenda Wallace
5a6d0f6342 Check admin before roles controller runs 2019-10-19 10:22:27 +13:00
Brenda Wallace
2ddddb1652 Updated specs for admin editing roles 2019-10-19 10:16:02 +13:00
Brenda Wallace
dc3bc85777 Remove comments 2019-10-19 09:44:05 +13:00
Brenda Wallace
1a34bfb9a2 Merge remote-tracking branch 'origin/role-admin' into role-admin 2019-10-19 09:43:12 +13:00
Brenda Wallace
21848bf5b4 Merge branch 'dev' into role-admin 2019-10-19 09:42:49 +13:00
Brenda Wallace
80b82a99fe Fix broken spec on dev 2019-10-19 09:41:09 +13:00
codefactor-io
6d472c5d66 [CodeFactor] Apply fixes 2019-10-07 23:35:39 +00:00