Commit Graph

106 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
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
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]
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
a7a5b6ef17 Remove required text UI element 2024-10-13 11:56:56 +00:00
Daniel O'Connor
8b4f0771c5 Ruby 3.2: Rubocop - Fix Negation matcher (#3780)
* Ruby 3.2/Bundler 2.4

* Fix creation

* Upgrade to js-routes 2. Put all js routes into a global namespace.

* Remove js-routes

* Remove

* Adjust ownership

* Appease codeclimate for the nth time

* Fix deprecation warning by explicitly calling to_fs

* Fix deprecation warning by explicitly calling to_fs

* Fix deprecation warning by explicitly calling to_fs

* Swap to will paginate successor for bootstrap

* Update app/views/members/show.html.haml

* Update app/views/plantings/index.rss.haml

* Update .env

* Update .devcontainer/.env

* Fix spec

* Update spec

* Fix spec

* Pin to 2.4.22

* 3 space indent

* Regenerate

* Update rubocop

* Rubocop

* More rubocop

* Regenerate

* Fix Capybara/NegationMatcher
2024-07-13 15:20:11 +09: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
d1f754a288 Rubocop 2022-11-08 00:23:38 +10:30
Daniel O'Connor
2db3d1bacc Various corrections 2022-11-08 00:21:23 +10:30
Daniel O'Connor
34af93cfc2 Rubocop 2022-11-08 00:19:52 +10:30
Daniel O'Connor
b24b9f82e6 Rubocop - auto corrections 2022-11-06 16:34:36 +10:30
Awesome Code
593059d4aa Auto corrected by following Lint Ruby Capybara/CurrentPathExpectation 2020-05-23 07:48:28 +12:00
Brenda
88ac147dda Restore old labels on buttons 2020-03-01 07:56:34 +13:00
Brenda Wallace
4ca949a703 Added another reindex to specs 2020-01-12 10:14:20 +13:00
Brenda Wallace
7a0458e7e0 reindex plantings before crop planting spec 2020-01-10 13:31:45 +13:00
Brenda Wallace
c708d4d22b Mark spec as needing elastic search 2019-12-24 22:01:55 +13:00
Brenda Wallace
8bec2a277d Merge branch 'dev' into cache/harvests 2019-12-21 16:59:47 +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
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00: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
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
faf375c932 Feature spec for month by month harvest 2019-11-25 13:25:05 +13:00
Brenda Wallace
c6fffebb28 Update specs for new index layout with api docs 2019-11-18 10:50:13 +13:00
Brenda Wallace
c27622803d Specs for linking plantings to seeds 2019-11-01 17:18:51 +13:00
Brenda Wallace
627d97155f Tidy up 2019-10-24 19:59:18 +13:00
Brenda Wallace
c094b5daf9 Update spec, to look for new emojii timeline 2019-10-24 18:55:47 +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
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
34b399cd8e Use more signed in contexts in browse crops spec
More member role contexts on alt name spec

More member role contexts in crop feature specs

Don't wrap the shared_context
2019-08-18 16:10:03 +12:00
Brenda Wallace
756cf1fe3a Removing unused code in specs 2019-08-18 14:51:24 +12:00
Brenda Wallace
8936933251 Shared context for signing in (and then out) in feature specs 2019-08-17 14:10:56 +12:00
Brenda Wallace
d21cbf994b poltergeist work around not needed anymore 2019-06-15 14:34:49 +12:00
Brenda Wallace
628a7e3ae1 Fix planting specs 2019-06-08 17:02:59 +12:00
Brenda Wallace
f4457f877f fixing planting specs 2019-06-08 16:02:06 +12:00
Brenda Wallace
5484664716 Update spec 2019-04-20 12:16:58 +12:00
Brenda Wallace
91b7f58e9d No longer have 100% on plantings that are finished 2019-04-20 09:45:06 +12:00
Brenda Wallace
1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace
0ae33d9b03 Merge branch 'dev' into plantings-show 2019-04-13 21:02:56 +12:00
Brenda Wallace
0a0cd24e2a Removed extra reindex 2019-04-13 10:06:44 +12:00
Brenda Wallace
e5c0edb0d0 Tidy up specs 2019-04-08 21:39:20 +12:00
Brenda Wallace
bd797a4d8e Change call to reindex crops in specs 2019-04-08 21:39:20 +12:00
Awesome Code
4ba5319ba8 Auto corrected by following Lint Ruby Capybara/FeatureMethods 2019-04-01 23:02:50 +13:00
Brenda Wallace
6cf60afec4 Don't check for markasinished on plantings#index 2019-03-29 15:49:11 +13:00
Brenda Wallace
bab9c01bf5 Updating tests 2019-03-29 10:25:30 +13:00
Brenda Wallace
9be4c4179f Updating specs 2019-03-28 15:49:39 +13:00
Awesome Code
ad470ede1d Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-13 17:23:33 +13:00
Brenda Wallace
c298a1763f Merge branch 'dev' into photos/seeds 2019-02-12 16:21:51 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Brenda Wallace
572af9d135 Merge branch 'dev' into photos/seeds 2019-02-09 17:00:58 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00