mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-12 02:50:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,481 Commits 54 Branches 77 Tags
release55
Commit Graph

10481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel O'Connor
7e1432c8c4 Merge branch 'mainline' into dev release55 2024-02-04 10:32:34 +10:30
Daniel O'Connor
6102f0629b Revert 140fe7a (#3612) 
* Revert 140fe7a

* Split rendering behaviour
 2024-02-04 10:25:41 +10:30
Daniel O'Connor
bc47ea4e23 Merge pull request #3546 from Growstuff/dev 
January 2024 Release
 2024-02-03 18:24:57 +10:30
Daniel O'Connor
fb86448061 HAML 6 (#3607) 
* HAML

* rewrite

* Fix specs - but likely still wrong

* Return temple

* Trailing line

* Fix specs

* This was rearranged, apparently.

* Fix tests

* Retain escaping

* Fix specs

* Rubocop

* Apparently the escaped filter doesn't work with interpolation. Swap to our implementation
 2024-02-03 17:33:39 +10:30
dependabot[bot]
e450a0613f Merge pull request #3608 from Growstuff/dependabot/bundler/dalli-3.2.7 2024-01-30 11:43:24 +00:00
dependabot[bot]
4b4d246237 Bump dalli from 3.2.6 to 3.2.7 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 3.2.6 to 3.2.7.
- [Changelog](https://github.com/petergoldstein/dalli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v3.2.6...v3.2.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-29 09:34:52 +00:00
dependabot[bot]
823e73575c Merge pull request #3609 from Growstuff/dependabot/bundler/capybara-3.40.0 2024-01-29 09:33:47 +00:00
dependabot[bot]
a4b4348f0b Bump capybara from 3.39.2 to 3.40.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.39.2 to 3.40.0.
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.39.2...3.40.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-29 07:16:18 +00:00
Daniel O'Connor
008667515e Swap from ugifier to terser 2024-01-27 01:28:55 +00:00
Daniel O'Connor
8249edd966 Add msgpack due to rails requesting it 2024-01-27 00:14:21 +00:00
Daniel O'Connor
f338274611 Rails 7.1 (#3590) 
* Rails 7.1

* Update application.rb

* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search

* Sync translation

* Drop required from form group

* Loosen specs further

* Fix Gemfile

* Update seeds_request_spec.rb

* Update test.rb

* Rename
 2024-01-27 10:06:47 +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
254fd156f0 Remove faraday_middleware (#3604) 
* Remove faraday_middleware

* Remove outdated migration

* Remove outdated migration
 2024-01-27 00:10:17 +10:30
Daniel O'Connor
b711618027 Unpin active_median (#3603) 
* Unpin active_median

* Remove outdated migration

* Remove outdated migration
 2024-01-26 23:47:59 +10:30
Brenda Wallace
30626859c3 Auto corrected by following Format Css Code (#3594) 
Co-authored-by: Awesome Code <team@xinminlabs.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
 2024-01-26 23:01:55 +10:30
Daniel O'Connor
140fe7a087 Bump searchkick, elasticsearch (#3602) 
* Bump searchkick

* Bump to 7.0.0

* Fix

* Fix crop search
 2024-01-26 23:01:39 +10:30
dependabot[bot]
49cd657916 Merge pull request #3601 from Growstuff/dependabot/bundler/rspec-rails-6.1.1 2024-01-26 10:34:17 +00:00
dependabot[bot]
4ad4379991 Bump rspec-rails from 6.1.0 to 6.1.1 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.0 to 6.1.1.
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.0...v6.1.1)

---
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-01-26 07:54:49 +00:00
dependabot[bot]
b55f9654ea Merge pull request #3600 from Growstuff/dependabot/bundler/rubocop-1.60.2 2024-01-26 06:42:09 +00:00
dependabot[bot]
6ad47f7203 Bump rubocop from 1.60.1 to 1.60.2 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.1 to 1.60.2.
- [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.1...v1.60.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-25 07:58:32 +00:00
dependabot[bot]
e879541257 Merge pull request #3599 from Growstuff/dependabot/bundler/haml_lint-0.55.0 2024-01-24 10:23:22 +00:00
dependabot[bot]
cc2eec4fe8 Bump haml_lint from 0.54.0 to 0.55.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.54.0 to 0.55.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.54.0...v0.55.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-24 07:24:09 +00:00
Daniel O'Connor
f87c5db40e Merge pull request #3597 from Growstuff/dependabot/bundler/selenium-webdriver-4.17.0 
Bump selenium-webdriver from 4.16.0 to 4.17.0
 2024-01-23 23:05:43 +10:30
Daniel O'Connor
581b85a300 Merge pull request #3598 from Growstuff/dependabot/bundler/haml_lint-0.54.0 
Bump haml_lint from 0.53.0 to 0.54.0
 2024-01-23 23:05:21 +10:30
Daniel O'Connor
32f39b47e2 Merge pull request #3596 from Growstuff/dependabot/bundler/axe-core-rspec-4.8.1 
Bump axe-core-rspec from 4.8.0 to 4.8.1
 2024-01-23 23:05:08 +10:30
Daniel O'Connor
29c614d31e Merge pull request #3595 from Growstuff/dependabot/bundler/axe-core-capybara-4.8.1 
Bump axe-core-capybara from 4.8.0 to 4.8.1
 2024-01-23 23:04:50 +10:30
dependabot[bot]
52012ea238 Bump haml_lint from 0.53.0 to 0.54.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.53.0 to 0.54.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.53.0...v0.54.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-23 07:53:28 +00:00
dependabot[bot]
9aed6af772 Bump selenium-webdriver from 4.16.0 to 4.17.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 4.16.0 to 4.17.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.16.0...selenium-4.17.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-01-23 07:37:55 +00:00
dependabot[bot]
53abbaddd7 Bump axe-core-rspec from 4.8.0 to 4.8.1 
Bumps [axe-core-rspec](https://github.com/dequelabs/axe-core-gems) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.8.0...v4.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-23 07:36:40 +00:00
dependabot[bot]
b443afc965 Bump axe-core-capybara from 4.8.0 to 4.8.1 
Bumps [axe-core-capybara](https://github.com/dequelabs/axe-core-gems) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/dequelabs/axe-core-gems/releases)
- [Changelog](https://github.com/dequelabs/axe-core-gems/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.8.0...v4.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-23 07:33:10 +00:00
Daniel O'Connor
12ff09ad51 Add Accessibility assertions to rspec, replacing accessbility-lint + fixes (#3573) 
* Add dep

* Add tests around accessibility

* Add examples in a few places

* Try to fix screenshots

* Remove redundant role

* Adjust rules, colors, etc so tests pass

* Update app/assets/stylesheets/overrides.scss

* Wrap in label

* Omit rule, which is failing with a false positive

* Update index.haml

* Update _blurb.html.haml
 2024-01-22 22:09:27 +10:30
Daniel O'Connor
75aba7158f Merge pull request #3593 from Growstuff/rename 
Rename spec/models/garden_type.rb
 2024-01-22 22:08:49 +10:30
dependabot[bot]
093fa645fd Merge pull request #3591 from Growstuff/dependabot/bundler/recaptcha-5.16.0 2024-01-22 08:38:58 +00:00
Daniel O'Connor
1d52f8fcad Rename 2024-01-22 08:31:33 +00:00
dependabot[bot]
a134b1e3ab Bump recaptcha from 5.15.0 to 5.16.0 
Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 5.15.0 to 5.16.0.
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ambethia/recaptcha/compare/v5.15.0...v5.16.0)

---
updated-dependencies:
- dependency-name: recaptcha
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 08:22:25 +00:00
dependabot[bot]
c5694ad1ab Merge pull request #3592 from Growstuff/dependabot/bundler/sidekiq-7.2.1 2024-01-22 08:21:35 +00:00
dependabot[bot]
28bdf9adde Bump sidekiq from 7.2.0 to 7.2.1 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.2.0 to 7.2.1.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.2.0...v7.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 07:51:40 +00:00
Daniel O'Connor
ae3747ce83 Merge pull request #3589 from Growstuff/jquery-ui-rails 
Update jquery-ui-rails
 2024-01-22 00:33:38 +10:30
Daniel O'Connor
50b6708c7f Update jquery-ui-rails 2024-01-21 13:42:48 +00:00
Daniel O'Connor
196b8078e6 Posts - Ensure responsive (#3584) 
* Fix model validations and responsiveness

* Fix model validations and responsiveness

* Update app/models/post.rb
 2024-01-21 16:05:14 +10:30
Daniel O'Connor
86cc678fc7 Add feature 2024-01-21 05:20:57 +00:00
Daniel O'Connor
91f8c2e0b3 Harvests - Compare dates to dates when determing how long ago something was (#3585) 
* Compare dates to dates

* Adjust timeline display to check if Date or Time
 2024-01-21 15:20:32 +10:30
Daniel O'Connor
8546794311 Recaptcha (#3586) 
* add recaptcha on register view

Update new.html.haml to add it

* Update Gemfile to add recaptcha

* Update env-example to show recaptcha

* More view corrections for recaptcha

* Update registrations_controller.rb to add recaptcha

* Update env-example with test config

* Recaptcha help text

* Fix trailing spaces

* Fix trailing space

* Add Recaptcha to gemfile.lock

* Fixing Gemfile.lock space

* Typo on comments in view

* Update app/views/devise/registrations/new.html.haml

* Fix signup

---------

Co-authored-by: Cesy <cesy.avon@gmail.com>
 2024-01-21 15:20:03 +10:30
Daniel O'Connor
b77df88df9 Issues/1475: Ensure we have pagination (#3193) 
* Paginate, 100 at a time

* Limited i18n

* Paginate roles

* Pagination

* Pagination

* i18n and pagination

* Paginate alternate names

* Silence code climate

* Rewrite coverage as a feature

* Remove coverage in favour of crops/scientific_name_spec

* Add missing admin link

* Rewrite coverage as feature

* Rewrite coverage

---------

Co-authored-by: Brenda Wallace <brenda@wallace.net.nz>
 2024-01-21 14:19:36 +10:30
Daniel O'Connor
1f0cfa9b6c Add GBIF to our scientific names, so that our crops can associate creative commons photos (#3559) 
* Add GBIF cient

* Add lookup

* Add autocomplete for GBIF lookup

* Add extra detail to scientific names

* Autocomplete

* Add routes

* Rmeove mapping

* Add autocomplete

* Update GBIF data on save

* db/schema

* Style

* Extract service

* Add concern

* Add concern

* Save photos

* Initial coverage

* Coverage

* Add coverage

* Shut up, codeclimate

* Shut up, codeclimate

* Unused

* Shut up, codeclimate

* Apply suggestions from code review

* Remove localhost

* Fix rubocop

* Fix rubocop

* Add UI links

* Add rake

* Indent

* Update Gemfile.lock

* Update lib/tasks/gbif.rake

* Update app/views/crops/_scientific_names.html.haml

* Rubocop

* Expand edit photo form

* Fix error

* Add model validations

* Skip photos without backlinks

* Fix tests

* Add photo words

* Allow blank

* Rubocop and handle invalid legacy data

* Apply suggestions from code review

* Update lib/tasks/gbif.rake
 2024-01-21 13:22:25 +10:30
Daniel O'Connor
1840e36d77 Merge pull request #3583 from Growstuff/active-plantings 
Crops > Plantings - Show count of active only as the following page is active
 2024-01-21 13:22:08 +10:30
Daniel O'Connor
c114f080a9 Active only as the following page is active 2024-01-21 01:58:53 +00:00
Daniel O'Connor
4aae30309b Merge pull request #3582 from Growstuff/add-label 
Accessibility: Wrap checkbox in label
 2024-01-21 12:10:11 +10:30
Daniel O'Connor
09a7ce6483 Wrap in label 2024-01-21 01:21:09 +00:00
Daniel O'Connor
adb0ed041b Merge pull request #3580 from Growstuff/headings 
Drop use of h5
 2024-01-20 21:22:05 +10:30