mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-26 10:45:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,808 Commits 54 Branches 76 Tags
fc6ee9db36ed052d1adea3ec59d0af2dcbd2b6d6
Commit Graph

126 Commits

Author SHA1 Message Date
Daniel O'Connor
488e402a3a Adjust copy of activities and prompts (#4260) 
* Adjust copy

* Adjust copy

* Move repeat prompt

* Improve prompts

* Clean up schema

* Fix spec
 2025-09-21 14:58:13 +09:30
Daniel O'Connor
54acc369ab Rubocop 2025-09-20 09:43:22 +00:00
Daniel O'Connor
ce7ce70d5f Merge pull request #4222 from Growstuff/feature/add-activity-prompts 
feat: Add prompts for new activities
 2025-09-20 17:49:47 +09:30
Daniel O'Connor
2bc164bd2e Render history 2025-09-07 07:59:51 +00:00
Daniel O'Connor
c189e3b01a Merge pull request #4062 from Growstuff/feature/planting-rating 
Add overall_rating to Plantings
 2025-09-01 23:56:13 +09:30
google-labs-jules[bot]
ba6ec689c5 Merge pull request #4150 from Growstuff/feature/failed-plantings 
Add failed status to plantings
 2025-08-27 23:42:53 +09:30
google-labs-jules[bot]
a98990ccd2 Add transplant feature for plantings (#4133) 
* Add ability to transplant a planting

* Fix view tests

* Transplantable gardens

* Add spec

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
 2025-08-24 22:31:14 +09:30
Daniel O'Connor
5be0153c74 Activities (#3646) 
* Implement activities

* Add activities to timeline

* Add factory

* Add coverage

* Fix misc issues

* Activities display

* Add activities to garden and plantings

* Add activities to garden and plantings

* Add planting

* Add to planting, harvest show

* More CRUD

* More CRUD

* index

* index

* Extract card view

* Permissions

* Add edit

* Remove workaround fro vs code

* Fix title

* CSV

* CSV

* Add RSS, ical

* Extend ical slightly

* Cleanup

* Rubocop

* Remove doubled form

* Change icon

* Fix short description

* Add menus

* Put homepage widget in

* Add activity icon - MIT licenced - https://www.svgrepo.com/svg/336823/plan

* Naming

* Missing files

* Revert VS Code lag induced change

* Update app/views/home/_harvests.html.haml

* Update activities_controller.rb

* Update activities_controller.rb

* Update app/controllers/activities_controller.rb

* Update index.html.haml

* Apply suggestions from code review

* Apply suggestions from code review

* Typo

* Translation

* Apply suggestions from code review

* Update app/views/plantings/index.ics.erb

* Update app/models/activity.rb

* Update plantings_spec.rb

* Update plantings_spec.rb

* We are now rendering an extra event, so check the next one for the old behaviour
 2024-03-10 11:36:24 +10:30
Daniel O'Connor
ad4a6e17e2 iCalendar feed of plantings (#3588) 
* Register mime type

* Add rough first pass

* Index predictions, and add links

* Trailing space

* Fix implementation

* Fix names, make public

* Fix names, make public

* Fix

* Fix tyyos

* Add date

* If there are no predictions, keep growing

* Add a todo

* Fix factories

* Specs
 2024-01-27 00:38:33 +10:30
Daniel O'Connor
5b89aff98a Fix #3049 2023-03-13 08:05:31 +00:00
Daniel O'Connor
f75d2f33a5 DEPRECATION WARNING: TimeWithZone#to_s(:number) is deprecated. Please use TimeWithZone#to_fs(:number) instead. 2022-11-07 22:24:03 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Brenda Wallace
108a2052ca protect against not finding a crop 2021-01-27 07:50:19 +13:00
Brenda
d2509afca2 Harvest button on plantings 2020-02-29 09:33:40 +13:00
codefactor-io
6c9a15f95e [CodeFactor] Apply fixes 2020-01-11 21:29:37 +00:00
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Brenda Wallace
ce909332b7 plantings controller update 2019-12-28 09:15:52 +13: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
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
5e5cdf6246 Fixing up lookup by slug 2019-12-19 21:49:18 +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
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00: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
1dfbecfac0 Don't re-look up planting 2019-08-09 22:32:36 +12:00
Brenda Wallace
a69e4020d7 back to reading gardens from the plantings 2019-06-26 08:09:49 +12:00
Brenda Wallace
103d1ce2eb rubocop lint 2019-06-25 20:39:50 +12:00
Brenda Wallace
b1b6de0aae set @gardens for plantings controller and spec 2019-06-25 15:55:06 +12:00
Brenda Wallace
b9e2154edb rubocop lint 2019-06-14 16:39:25 +12:00
Brenda Wallace
39586cc1ba Update app/controllers/plantings_controller.rb 2019-06-12 16:23:29 +12:00
codefactor-io
571f4298bb [CodeFactor] Apply fixes 2019-06-11 21:22:53 +00:00
Brenda Wallace
3d11dac718 Fixing harvest specs 2019-06-08 18:21:15 +12:00
codefactor-io
2786476faa [CodeFactor] Apply fixes 2019-06-06 08:37:27 +00:00
Brenda Wallace
cf69c13527 fix up erros on planting form 2019-06-03 22:47:19 +12:00
Brenda Wallace
11afea1c54 fixing plantings form 2019-06-03 22:22:53 +12:00
codefactor-io
7f1bb7913c [CodeFactor] Apply fixes 2019-05-29 21:48:42 +00:00
Brenda Wallace
20fbec96d4 Tidying up forms 2019-05-24 20:14:24 +12:00
Brenda Wallace
a58ce0f6a2 Tidy up mobile 2019-03-30 18:01:55 +13:00
Brenda Wallace
0c9702e1a4 Move photo query, so we use eager loading 2019-03-27 22:28:06 +13:00
Brenda Wallace
e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
Brenda Wallace
8cb9361462 only look up member/crop if an slug is passed 2019-01-06 08:45:42 +13:00