Commit Graph

10593 Commits

Author SHA1 Message Date
dependabot[bot]
47ef858cdf Merge pull request #3697 from Growstuff/dependabot/bundler/axe-core-rspec-4.9.0 release57 2024-03-30 06:27:21 +00:00
dependabot[bot]
627e6d0267 Bump axe-core-rspec from 4.8.2 to 4.9.0
Bumps [axe-core-rspec](https://github.com/dequelabs/axe-core-gems) from 4.8.2 to 4.9.0.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/v4.9.0/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.8.2...v4.9.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-30 06:06:17 +00:00
dependabot[bot]
785129e113 Merge pull request #3695 from Growstuff/dependabot/bundler/axe-core-capybara-4.9.0 2024-03-30 06:04:00 +00:00
dependabot[bot]
f7d6438e0a Bump axe-core-capybara from 4.8.2 to 4.9.0
Bumps [axe-core-capybara](https://github.com/dequelabs/axe-core-gems) from 4.8.2 to 4.9.0.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/v4.9.0/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.8.2...v4.9.0)

---
updated-dependencies:
- dependency-name: axe-core-capybara
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-30 05:45:22 +00:00
dependabot[bot]
9a6b0745b7 Merge pull request #3694 from Growstuff/dependabot/bundler/selenium-webdriver-4.19.0 2024-03-30 05:43:31 +00:00
dependabot[bot]
844bfb3e1a Bump selenium-webdriver from 4.18.1 to 4.19.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.18.1 to 4.19.0.
- [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.18.1...selenium-4.19.0)

---
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-03-30 05:26:41 +00:00
dependabot[bot]
3f936b2269 Merge pull request #3696 from Growstuff/dependabot/bundler/sprockets-3.7.3 2024-03-30 05:25:05 +00:00
dependabot[bot]
b218886069 Bump sprockets from 3.7.2 to 3.7.3
Bumps [sprockets](https://github.com/rails/sprockets) from 3.7.2 to 3.7.3.
- [Release notes](https://github.com/rails/sprockets/releases)
- [Changelog](https://github.com/rails/sprockets/blob/v3.7.3/CHANGELOG.md)
- [Commits](https://github.com/rails/sprockets/compare/v3.7.2...v3.7.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-29 11:57:41 +00:00
Daniel O'Connor
f8764f4953 Merge pull request #3698 from Growstuff/dependabot/bundler/terser-1.2.1
Bump terser from 1.2.0 to 1.2.1
2024-03-29 22:25:39 +10:30
dependabot[bot]
5d09a8271c Bump terser from 1.2.0 to 1.2.1
Bumps [terser](https://github.com/ahorek/terser-ruby) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/ahorek/terser-ruby/releases)
- [Changelog](https://github.com/ahorek/terser-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ahorek/terser-ruby/compare/1.2.0...1.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-29 07:07:43 +00:00
dependabot[bot]
c9261b1c6a Merge pull request #3693 from Growstuff/dependabot/bundler/faker-3.3.0 2024-03-26 08:52:21 +00:00
dependabot[bot]
719644c8a5 Bump faker from 3.2.3 to 3.3.0
Bumps [faker](https://github.com/faker-ruby/faker) from 3.2.3 to 3.3.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v3.2.3...v3.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-26 07:46:08 +00:00
Daniel O'Connor
803a00f1c4 Merge pull request #3688 from Growstuff/dependabot/bundler/rubocop-rails-2.24.1
Bump rubocop-rails from 2.24.0 to 2.24.1
2024-03-26 07:42:14 +10:30
Daniel O'Connor
bfae190608 Merge pull request #3692 from Growstuff/dependabot/bundler/rdoc-6.6.3.1
Bump rdoc from 6.6.2 to 6.6.3.1
2024-03-26 07:41:53 +10:30
Daniel O'Connor
bcc818c23b Merge pull request #3690 from Growstuff/dependabot/bundler/carrierwave-3.0.7
Bump carrierwave from 3.0.5 to 3.0.7
2024-03-26 07:41:32 +10:30
dependabot[bot]
c853e08b2c Bump rdoc from 6.6.2 to 6.6.3.1
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rdoc/compare/v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 19:59:23 +00:00
dependabot[bot]
c9c4df39ed Bump carrierwave from 3.0.5 to 3.0.7
Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 3.0.5 to 3.0.7.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v3.0.5...v3.0.7)

---
updated-dependencies:
- dependency-name: carrierwave
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 19:47:29 +00:00
dependabot[bot]
ab32e251b9 Bump rubocop-rails from 2.24.0 to 2.24.1
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.24.0 to 2.24.1.
- [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.24.0...v2.24.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 10:14:28 +00:00
dependabot[bot]
226b1c7ab1 Merge pull request #3689 from Growstuff/dependabot/bundler/ruby-units-4.0.3 2024-03-25 10:11:51 +00:00
dependabot[bot]
ccb7dbc17c Bump ruby-units from 4.0.2 to 4.0.3
Bumps [ruby-units](https://github.com/olbrich/ruby-units) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/olbrich/ruby-units/releases)
- [Changelog](https://github.com/olbrich/ruby-units/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/olbrich/ruby-units/compare/v4.0.2...v4.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 07:30:36 +00:00
Daniel O'Connor
2f5d397f25 Merge branch 'mainline' into dev 2024-03-24 22:20:07 +10:30
Daniel O'Connor
eb6f032272 Attempt to fix inbox (#3687)
* Move delete button

* Swap for different displays

* Swap for different displays

* Reorganise

* Reorganise

* Update spec

* Update spec
2024-03-24 22:19:30 +10:30
Daniel O'Connor
bac825fe65 Merge pull request #3686 from Growstuff/opacity
Improve readibility
2024-03-24 20:36:14 +10:30
Daniel O'Connor
c7de9a4d91 Improve readibility 2024-03-24 09:50:56 +00:00
Daniel O'Connor
7c6508e387 Overflow of location badges (#3685)
* Swap to CSS for truncation

* Adjust styling on mobile

* Contain more

* Contain more

* All badges clip

* Adjust badges to truncate again

* Adjust badges to truncate again

* Apply suggestions from code review
2024-03-24 20:16:56 +10:30
Daniel O'Connor
84809d0490 Merge pull request #3681 from Growstuff/bs-5-minor
Add bootstrap 5 fixes which weren't in the activities branch
2024-03-23 16:56:05 +10:30
Daniel O'Connor
da37fd854d Add bootstrap 5 fixes which weren't in the activities branch 2024-03-23 05:49:06 +00:00
Daniel O'Connor
d282cadd91 Merge pull request #3666 from Growstuff/dev
Release for March 2024
2024-03-23 14:53:31 +10:30
dependabot[bot]
890f3d042a Merge pull request #3680 from Growstuff/dependabot/bundler/rspec-rails-6.1.2 2024-03-19 10:14:28 +00:00
dependabot[bot]
29b10c18d7 Bump rspec-rails from 6.1.1 to 6.1.2
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.1 to 6.1.2.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.1...v6.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-19 07:22:10 +00:00
Daniel O'Connor
47ad915ab3 Remove sort form (#3679)
* Remove sort form

* Remove stale test
2024-03-17 21:56:36 +10:30
dependabot[bot]
ecfb402266 Merge pull request #3678 from Growstuff/dependabot/bundler/rubocop-1.62.1 2024-03-12 11:16:11 +00:00
dependabot[bot]
48b3b53f2e Bump rubocop from 1.62.0 to 1.62.1
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.0 to 1.62.1.
- [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.62.0...v1.62.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-12 07:12:28 +00:00
Daniel O'Connor
d30854dd51 Merge pull request #3677 from Growstuff/labelling
Use correct translation for buttons
2024-03-12 00:52:14 +10:30
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