raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,795 Commits 17 Branches 456 Tags
0bfceb877df8ced914b48bd5093ac55b5f78615a
Commit Graph

26795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konrad
0bfceb877d Merge pull request #10666 from jibees/9723-admin-missing-translation-in-payment-report 
Admin, Payment reports: add missing translation for payment state
 2023-04-12 15:47:23 +02:00
Filipe
c1d28b2e8f Merge pull request #10119 from binarygit/donot-hide-producers-name-in-products 
Display producer's name in products inspite of hide all refs option
 2023-04-12 13:07:52 +01:00
jibees
98e44e7a40 Merge pull request #10687 from openfoodfoundation/dependabot/bundler/nokogiri-1.14.3 
Bump nokogiri from 1.14.2 to 1.14.3
 2023-04-12 10:25:56 +02:00
jibees
51c6c19f80 Merge pull request #10669 from openfoodfoundation/dependabot/bundler/sidekiq-7.0.8 
Bump sidekiq from 7.0.7 to 7.0.8
 2023-04-12 10:24:59 +02:00
dependabot[bot]
75b7a1864b Bump nokogiri from 1.14.2 to 1.14.3 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.2 to 1.14.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.14.2...v1.14.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-12 06:24:59 +00:00
jibees
193ae7936e Merge pull request #10681 from openfoodfoundation/dependabot/bundler/rubocop-1.50.0 
Bump rubocop from 1.49.0 to 1.50.0
 2023-04-11 20:40:55 +02:00
Filipe
0971e8d9b5 Merge pull request #10644 from mkllnk/report-timeout-message 
[Hidden] Display a friendly message when a background report times out
 2023-04-11 19:40:42 +01:00
Jean-Baptiste Bellet
e78b44b9ca Do not shows <a /> if producers is hidden 
Different style as it does not open any modal
 2023-04-11 14:27:57 +02:00
binarygit
c5779eff81 Do not open modal for producer's who are 'hidden' 2023-04-11 14:27:57 +02:00
Jean-Baptiste Bellet
b616c14f63 Don't hide producer's name in products despite hide all refs opt selected 2023-04-11 14:26:47 +02:00
dependabot[bot]
f4c351febf Bump rubocop from 1.49.0 to 1.50.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.49.0 to 1.50.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.49.0...v1.50.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-11 10:05:30 +00:00
Maikel Linke
30184ac6aa Background reports time out earlier than nginx 
This allows us to display a friendly message before nginx displays its
default error.
 2023-04-11 16:44:13 +10:00
Konrad
15058299d8 Merge pull request #10641 from openfoodfoundation/dependabot/npm_and_yarn/babel/preset-env-7.21.4 
Bump @babel/preset-env from 7.18.2 to 7.21.4
 2023-04-10 20:00:06 +02:00
Jean-Baptiste Bellet
c7cb982c9a Update browser list 
```
npx update-browserslist-db@latest
```
 2023-04-10 11:20:19 +02:00
Jean-Baptiste Bellet
34e9112c0a Fix dependencies warning: adds core and `plugin-transform-runtime 2023-04-10 11:20:19 +02:00
dependabot[bot]
28eb11bda5 Bump @babel/preset-env from 7.20.2 to 7.21.4 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.20.2 to 7.21.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-10 11:20:19 +02:00
jibees
d8e82d9c88 Merge pull request #10668 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.120.1 
Bump aws-sdk-s3 from 1.120.0 to 1.120.1
 2023-04-10 11:12:45 +02:00
jibees
5192a08082 Merge pull request #10673 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.19.0 
Bump rubocop-rails from 2.18.0 to 2.19.0
 2023-04-07 14:33:31 +02:00
jibees
94d3f136e2 Merge pull request #10672 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.2.6 
Bump @floating-ui/dom from 1.2.5 to 1.2.6
 2023-04-07 14:32:45 +02:00
dependabot[bot]
db3a923ea7 Bump rubocop-rails from 2.18.0 to 2.19.0 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.18.0 to 2.19.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.18.0...v2.19.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>
 2023-04-07 09:59:34 +00:00
dependabot[bot]
619eb43c57 Bump @floating-ui/dom from 1.2.5 to 1.2.6 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.2.6/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-07 09:58:01 +00:00
filipefurtad0
680b6a7122 Update all locales with the latest Transifex translations v4.3.2 2023-04-07 10:17:13 +01:00
Filipe
d9e9add78b Merge pull request #10527 from vviekk/10456 
Fixing 'unsaved' alert behaviour for order cycle edit forms
 2023-04-06 17:05:49 +01:00
Filipe
8893824b06 Merge pull request #10635 from jibees/fix-content-security-policy-for-local-images 
Fix content security policy: authorize `ENV["SITE_URL"]` as trusted domain for images
 2023-04-06 11:25:05 +01:00
dependabot[bot]
5c221621d3 Bump sidekiq from 7.0.7 to 7.0.8 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.0.7 to 7.0.8.
- [Release notes](https://github.com/sidekiq/sidekiq/releases)
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.0.7...v7.0.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-06 09:58:23 +00:00
dependabot[bot]
60d7ed5036 Bump aws-sdk-s3 from 1.120.0 to 1.120.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.120.0 to 1.120.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-06 09:57:53 +00:00
Filipe
e71a747925 Merge pull request #10667 from jibees/10662-flaky-specqueriescustomers_with_balance_specrb26 
Flaky: Avoid flaky spec by sorting array before comparing on `spec/queries/customers_with_balance_spec.rb:26`
 2023-04-06 10:47:32 +01:00
Jean-Baptiste Bellet
eedd421055 Avoid flaky spec by sorting array before comparing 2023-04-06 10:41:42 +02:00
Jean-Baptiste Bellet
e74328f1d7 Add i18n for payment state key 
+ update spec
 2023-04-06 10:28:44 +02:00
Jean-Baptiste Bellet
bb502c2e65 Authorize localhost:3000 as trusted domain for images 2023-04-06 10:10:44 +02:00
Jean-Baptiste Bellet
6abd652251 Factorize into inherited method from Base: payment_state(order) 2023-04-06 09:50:50 +02:00
Filipe
2f6b730ed4 Merge pull request #10614 from cillian/business-address-country-state-placeholders 
Add placeholders to business address country and state select fields
 2023-04-05 19:55:07 +01:00
Filipe
2ff464321c Merge pull request #10619 from openfoodfoundation/dependabot/npm_and_yarn/stimulus_reflex-3.5.0-rc1 
Bump stimulus_reflex and cable_ready from 3.5.0-preX to 3.5.0-rc2
 2023-04-05 17:37:15 +01:00
Filipe
fc8d9252d5 Merge pull request #10605 from abdellani/fix-impossible-to-reach-OCs-older-than-6-months 
Fix load order cycles by date ranges
 2023-04-05 17:33:51 +01:00
Rachel Arnould
3e5becf70a Merge pull request #10538 from jibees/10537-shopfront-product-description-is-too-long 
Shopfront: Force product description to be on one line
 2023-04-05 17:42:18 +02:00
Maikel
ef841b161f Merge pull request #10660 from MadisonBowron/master 
Fix bug #10596, missing translation for editing shipping category
 2023-04-05 16:12:20 +10:00
Maikel
c11dd2c1fb Merge pull request #10642 from macanudo527/fix_rubocop_errors 
Fix Rubocop Layout/LineLength
 2023-04-05 16:11:08 +10:00
Maikel Linke
8bbc545e39 Cover untranslated text by spec 2023-04-05 15:03:42 +10:00
Maikel
fc08913152 Merge pull request #10648 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.120.0 
Bump aws-sdk-s3 from 1.119.2 to 1.120.0
 2023-04-05 14:44:22 +10:00
Maikel
19ae3651fa Merge pull request #10643 from dacook/update-node-docker 
Update node for docker
 2023-04-05 14:43:24 +10:00
Jean-Baptiste Bellet
66307c9277 cable_ready changed its Content-Type ; update the mrujs one as well 
Thanks @marcoroth for the great debugging session! 🙏
 2023-04-05 14:19:34 +10:00
Jean-Baptiste Bellet
65084422cb cable_ready is already imported in app/webpacker/controllers/index.js 2023-04-05 14:19:34 +10:00
Jean-Baptiste Bellet
6f8ab56d2e Replace deprecated call render operations: 
```
DEPRECATED: CableReady's `render operations:` call has been renamed to `render cable_ready:`. Please update your render call.
```
 2023-04-05 14:19:34 +10:00
dependabot[bot]
ab6cdd4c78 Bump stimulus_reflex from 3.5.0-pre9 to 3.5.0-rc2 
Updating JS and Ruby libraries. This commit was started by Dependabot
for 3.5.0-rc1. Then we updated to rc2.

Old Dependabot message about rc1:
Bumps [stimulus_reflex](https://github.com/stimulusreflex/stimulus_reflex) from 3.5.0-pre9 to 3.5.0-rc1.
- [Release notes](https://github.com/stimulusreflex/stimulus_reflex/releases)
- [Changelog](https://github.com/stimulusreflex/stimulus_reflex/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusreflex/stimulus_reflex/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>

Bump cable_ready from 5.0.0-pre10 to 5.0.0-rc1

Bumps [cable_ready](https://github.com/stimulusreflex/cable_ready) from 5.0.0-pre10 to 5.0.0-rc1.
- [Release notes](https://github.com/stimulusreflex/cable_ready/releases)
- [Changelog](https://github.com/stimulusreflex/cable_ready/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusreflex/cable_ready/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-05 14:19:16 +10:00
David Cook
865d81d28f Apply suggestions from code review 2023-04-05 14:05:26 +10:00
Maikel Linke
020af0c0e4 Explain report timeout better to user 2023-04-05 09:59:02 +10:00
emiliecm
5abda22831 Fix bug #10596, missing translation for editing shipping category 2023-04-04 19:48:16 -04:00
Cillian O'Ruanaidh
89dac47aa6 Add placeholders to business address country and state select fields 2023-04-04 19:22:22 +01:00
jibees
e18d973047 Merge pull request #10655 from filipefurtad0/fix_flaky_oc_form_spec 
Sorts plucked shipping/payment methods
 2023-04-04 15:34:39 +02:00
jibees
afeeaf0a9b Merge pull request #10657 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.23 
Bump combine_pdf from 1.0.22 to 1.0.23
 2023-04-04 14:31:06 +02:00