mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-01 12:49:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 61 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
514b90c93a Fix #3676 2024-03-11 12:23:49 +00:00
Daniel O'Connor
938084612e Merge branch 'mainline' into dev 2024-03-10 20:45:30 +10:30
Daniel O'Connor
0713244116 Merge pull request #3664 from Growstuff/awesomecode-lint-javascript-unicorn-prefer-prototype-methods-60687 
Auto corrected by following Lint Javascript unicorn/prefer-prototype-methods
 2024-03-10 20:43:59 +10:30
Awesome Code
4d25de4663 Auto corrected by following Lint Javascript unicorn/prefer-prototype-methods 2024-03-10 01:19:43 +00:00
Daniel O'Connor
7d63234841 Upgrade to bootstrap 5 (#3605) 
* Upgrade boostrap

* Remove deprecated bootstrap toggles

* Migrate other details

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Avoid accidentally including bootstrap twice

* Fix spec

* Fix spec, where the size of the screen has gone to a partial breakpoint/you can't click on your own name in tablet view

* Fix spec

* Cleanup

* Cleanup
 2024-03-10 11:49:22 +10: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
80ee85f41a Merge pull request #3662 from Growstuff/dependabot/bundler/rubocop-1.62.0 
Bump rubocop from 1.61.0 to 1.62.0
 2024-03-10 10:33:42 +10:30
dependabot[bot]
f31ce97759 Bump rubocop from 1.61.0 to 1.62.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.61.0 to 1.62.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.61.0...v1.62.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-07 08:26:25 +00:00
dependabot[bot]
42921e2df2 Merge pull request #3658 from Growstuff/dependabot/bundler/rubocop-rspec-2.27.1 2024-03-07 08:24:32 +00:00
dependabot[bot]
b1d6297ccd Bump rubocop-rspec from 2.27.0 to 2.27.1 
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 2.27.0 to 2.27.1.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.27.0...v2.27.1)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-06 10:05:27 +00:00
dependabot[bot]
eb721d1c13 Merge pull request #3660 from Growstuff/dependabot/bundler/rack-cors-2.0.2 2024-03-06 10:04:22 +00:00
dependabot[bot]
9a6c1237f8 Bump rack-cors from 2.0.1 to 2.0.2 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 2.0.1 to 2.0.2.
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v2.0.1...v2.0.2)

---
updated-dependencies:
- dependency-name: rack-cors
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-05 07:40:29 +00:00
dependabot[bot]
2b168dca6a Merge pull request #3659 from Growstuff/dependabot/bundler/pg-1.5.6 2024-03-04 10:09:34 +00:00
dependabot[bot]
2bcf036c39 Bump pg from 1.5.5 to 1.5.6 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.5 to 1.5.6.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.5...v1.5.6)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-04 09:52:33 +00:00
Cesy
97afe86705 Merge pull request #3657 from Growstuff/dependabot/bundler/rubocop-rails-2.24.0 
Bump rubocop-rails from 2.23.1 to 2.24.0
 2024-03-04 09:48:03 +00:00
dependabot[bot]
43ea14e400 Bump rubocop-rails from 2.23.1 to 2.24.0 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.23.1...v2.24.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-04 08:04:12 +00:00
dependabot[bot]
6bc5393fc2 Merge pull request #3655 from Growstuff/dependabot/bundler/rubocop-1.61.0 2024-03-03 08:40:21 +00:00
dependabot[bot]
139f975788 Bump rubocop from 1.60.2 to 1.61.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.2 to 1.61.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.60.2...v1.61.0)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-03 06:47:28 +00:00
dependabot[bot]
0a7d4fbb9f Merge pull request #3656 from Growstuff/dependabot/bundler/rubocop-rspec-2.27.0 2024-03-03 06:46:27 +00:00
dependabot[bot]
9541d143db Bump rubocop-rspec from 2.26.1 to 2.27.0 
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 2.26.1 to 2.27.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.26.1...v2.27.0)

---
updated-dependencies:
- dependency-name: rubocop-rspec
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-01 07:25:50 +00:00
Daniel O'Connor
cb670191d6 Merge pull request #3645 from Growstuff/planning 
Planning future plantings - Minor UX changes
 2024-03-01 06:27:32 +10:30
dependabot[bot]
9765ea16d0 Merge pull request #3652 from Growstuff/dependabot/bundler/dotenv-rails-3.1.0 2024-02-29 10:15:52 +00:00
dependabot[bot]
f9d87e5e2c Bump dotenv-rails from 3.0.3 to 3.1.0 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.0.3...v3.1.0)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-29 09:33:17 +00:00
dependabot[bot]
128db15e79 Merge pull request #3654 from Growstuff/dependabot/bundler/chartkick-5.0.6 2024-02-29 09:27:37 +00:00
dependabot[bot]
38073295f6 Bump chartkick from 5.0.5 to 5.0.6 
Bumps [chartkick](https://github.com/ankane/chartkick) from 5.0.5 to 5.0.6.
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: chartkick
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-29 07:07:48 +00:00
Daniel O'Connor
f6ac14ac0f Merge pull request #3651 from Growstuff/dependabot/bundler/dotenv-rails-3.0.3 
Bump dotenv-rails from 3.0.2 to 3.0.3
 2024-02-27 18:50:24 +10:30
dependabot[bot]
d3421cde34 Bump dotenv-rails from 3.0.2 to 3.0.3 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.0.2...v3.0.3)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-27 07:40:00 +00:00
Daniel O'Connor
cf26b16579 Merge pull request #3650 from Growstuff/dependabot/bundler/listen-3.9.0 
Bump listen from 3.8.0 to 3.9.0
 2024-02-26 22:23:55 +10:30
dependabot[bot]
87f5115748 Bump listen from 3.8.0 to 3.9.0 
Bumps [listen](https://github.com/guard/listen) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](https://github.com/guard/listen/compare/v3.8.0...v3.9.0)

---
updated-dependencies:
- dependency-name: listen
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-26 08:16:27 +00:00
dependabot[bot]
025abde6cc Merge pull request #3649 from Growstuff/dependabot/bundler/rails-7.1.3.2 2024-02-24 14:43:53 +00:00
dependabot[bot]
b3293fddfd Bump rails from 7.1.3 to 7.1.3.2 
Bumps [rails](https://github.com/rails/rails) from 7.1.3 to 7.1.3.2.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v7.1.3...v7.1.3.2)

---
updated-dependencies:
- dependency-name: rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-22 07:55:45 +00:00
dependabot[bot]
60bec845c3 Merge pull request #3636 from Growstuff/dependabot/bundler/dalli-3.2.8 2024-02-20 21:00:29 +00:00
dependabot[bot]
66745b327d Bump dalli from 3.2.7 to 3.2.8 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 3.2.7 to 3.2.8.
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.7...v3.2.8)

---
updated-dependencies:
- dependency-name: dalli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-20 10:27:55 +00:00
dependabot[bot]
8bd0c5c369 Merge pull request #3647 from Growstuff/dependabot/bundler/sidekiq-7.2.2 2024-02-20 10:26:53 +00:00
dependabot[bot]
0e398be4bf Bump sidekiq from 7.2.1 to 7.2.2 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.2.1 to 7.2.2.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.2.1...v7.2.2)

---
updated-dependencies:
- dependency-name: sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-20 10:01:58 +00:00
dependabot[bot]
5e4702c205 Merge pull request #3648 from Growstuff/dependabot/bundler/selenium-webdriver-4.18.1 2024-02-20 10:00:56 +00:00
dependabot[bot]
c4788e1774 Bump selenium-webdriver from 4.17.0 to 4.18.1 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.17.0 to 4.18.1.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-4.17.0...selenium-4.18.1)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-20 07:21:11 +00:00
dependabot[bot]
1a95a46df5 Merge pull request #3640 from Growstuff/dependabot/bundler/letter_opener-1.9.0 2024-02-18 08:40:48 +00:00
dependabot[bot]
261f2fb758 Bump letter_opener from 1.8.1 to 1.9.0 
Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.8.1 to 1.9.0.
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.8.1...v1.9.0)

---
updated-dependencies:
- dependency-name: letter_opener
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-18 08:15:05 +00:00
Daniel O'Connor
ee4b2e1699 Merge pull request #3642 from Growstuff/dependabot/bundler/pg-1.5.5 
Bump pg from 1.5.4 to 1.5.5
 2024-02-18 18:43:32 +10:30
Daniel O'Connor
8593d2dfd9 Add rake task for clean up of old content (#3644) 2024-02-18 18:43:14 +10:30
Daniel O'Connor
e486db26db Fix icons 2024-02-18 03:40:27 +00:00
Daniel O'Connor
c0bcafdf51 Deal with future plantings 2024-02-18 03:33:34 +00:00
Daniel O'Connor
db71544a76 Explain you can plan out what you want to plant 2024-02-18 03:27:57 +00:00
Daniel O'Connor
f010320e51 Explain you can plan out what you want to plant 2024-02-18 03:27:47 +00:00
Daniel O'Connor
7b68e51328 Explain you can plan out what you want to plant 2024-02-18 03:26:46 +00:00
Daniel O'Connor
42e1dbb4da Rearrange member profile so that current progress is reported first, harvests second 2024-02-18 03:23:30 +00:00
dependabot[bot]
18ddcf9a33 Bump pg from 1.5.4 to 1.5.5 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.4 to 1.5.5.
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.5.4...v1.5.5)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-18 02:34:12 +00:00
dependabot[bot]
a4797c3f67 Merge pull request #3643 from Growstuff/dependabot/bundler/dotenv-rails-3.0.2 2024-02-18 02:33:07 +00:00
dependabot[bot]
fe4a64d16a Bump dotenv-rails from 3.0.1 to 3.0.2 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/main/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: dotenv-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-16 07:33:31 +00:00