raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-17 04:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,252 Commits 15 Branches 457 Tags
35ae3a424a32e848fa06aa3002e6c4945b538fc4
Commit Graph

35252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
35ae3a424a Merge pull request #14046 from openfoodfoundation/RachL-patch-1 
Update release task template
 2026-03-17 10:34:58 +11:00
Maikel
c2c83898a2 Merge pull request #14045 from openfoodfoundation/dependabot/bundler/knapsack_pro-9.2.3 
Bump knapsack_pro from 9.2.2 to 9.2.3
 2026-03-17 10:33:27 +11:00
Maikel
2879f77aa1 Merge pull request #14044 from openfoodfoundation/dependabot/bundler/json-2.19.1 
Bump json from 2.18.1 to 2.19.1
 2026-03-17 10:32:57 +11:00
Rachel Arnould
68032657c3 Update release task template 
Add a reminder + change the last step
 2026-03-16 12:10:17 +01:00
dependabot[bot]
be4037d05a Bump knapsack_pro from 9.2.2 to 9.2.3 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 9.2.2 to 9.2.3.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v9.2.2...v9.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-16 10:05:34 +00:00
dependabot[bot]
9661e8a53e Bump json from 2.18.1 to 2.19.1 
Bumps [json](https://github.com/ruby/json) from 2.18.1 to 2.19.1.
- [Release notes](https://github.com/ruby/json/releases)
- [Changelog](https://github.com/ruby/json/blob/master/CHANGES.md)
- [Commits](https://github.com/ruby/json/compare/v2.18.1...v2.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-16 10:03:56 +00:00
David Cook
5e93c27277 Merge pull request #14041 from openfoodfoundation/dependabot/bundler/puma-7.2.0 
Bump puma from 6.5.0 to 7.2.0
 2026-03-16 09:57:17 +11:00
Ahmed Ejaz
2a67b616e8 Update all locales with the latest Transifex translations v5.4.6 2026-03-14 17:26:41 +05:00
Ahmed Ejaz
1708901b01 Merge pull request #13975 from AwsAqh/fix/session-cookie-domain-13974 
Fix shared login sessions between staging and production
 2026-03-14 17:22:28 +05:00
David Cook
247f144773 Remove string interpolation 2026-03-14 17:07:30 +05:00
AwsAqh
d09e288887 Update session_store.rb 2026-03-14 17:07:30 +05:00
AwsAqh
c8e4911a2d Update session_store.rb 2026-03-14 17:07:30 +05:00
AwsAqh
4cc2390e6d Fix session cookie domain isolation 2026-03-14 17:07:30 +05:00
Rachel Arnould
7fe4717077 Merge pull request #13985 from openfoodfoundation/dependabot/bundler/valid_email2-7.0.15 
Bump valid_email2 from 5.2.3 to 7.0.15
 2026-03-13 12:31:53 +01:00
dependabot[bot]
fcb3b67efb Bump puma from 6.5.0 to 7.2.0 
Bumps [puma](https://github.com/puma/puma) from 6.5.0 to 7.2.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/main/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.5.0...v7.2.0)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.2.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-13 09:33:46 +00:00
Gaetan Craig-Riou
50c0c3f0b6 Merge pull request #14025 from openfoodfoundation/dependabot/npm_and_yarn/webpack-5.105.4 
Bump webpack from 5.105.3 to 5.105.4
 2026-03-13 11:07:34 +11:00
Maikel
6d65607e3b Merge pull request #14022 from rioug/14014-manual-credit-customer-authorization 
[Payment with Credit] Fix manual crediting customer
 2026-03-13 09:33:03 +11:00
Maikel
43134223ca Merge pull request #14039 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.17 
Bump trix from 2.1.16 to 2.1.17
 2026-03-13 09:30:32 +11:00
dependabot[bot]
8510a3c70d Bump trix from 2.1.16 to 2.1.17 
Bumps [trix](https://github.com/basecamp/trix) from 2.1.16 to 2.1.17.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.16...v2.1.17)

---
updated-dependencies:
- dependency-name: trix
  dependency-version: 2.1.17
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-12 17:36:40 +00:00
dependabot[bot]
80ffcb9074 Bump webpack from 5.105.3 to 5.105.4 
Bumps [webpack](https://github.com/webpack/webpack) from 5.105.3 to 5.105.4.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Changelog](https://github.com/webpack/webpack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack/compare/v5.105.3...v5.105.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-12 01:44:14 +00:00
Maikel
cdd6c0f66c Merge pull request #14026 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.213.0 
Bump aws-sdk-s3 from 1.208.0 to 1.213.0
 2026-03-12 12:44:11 +11:00
Maikel
ebc7dc9bcf Merge pull request #14024 from openfoodfoundation/dependabot/npm_and_yarn/terser-webpack-plugin-5.3.17 
Bump terser-webpack-plugin from 5.3.16 to 5.3.17
 2026-03-12 12:42:08 +11:00
dependabot[bot]
98c3b0eac4 Bump aws-sdk-s3 from 1.208.0 to 1.213.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.208.0 to 1.213.0.
- [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-version: 1.213.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-11 09:33:29 +00:00
dependabot[bot]
5e46c35f68 Bump terser-webpack-plugin from 5.3.16 to 5.3.17 
Bumps [terser-webpack-plugin](https://github.com/webpack/terser-webpack-plugin) from 5.3.16 to 5.3.17.
- [Release notes](https://github.com/webpack/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack/terser-webpack-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/terser-webpack-plugin/compare/v5.3.16...v5.3.17)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-11 09:32:58 +00:00
Gaetan Craig-Riou
4946ffc329 Add specs for CustomerAccountTransaction ability 2026-03-11 15:45:33 +11:00
Gaetan Craig-Riou
c134bbf49b Add missing ability for credit customer 
Fix the specs to use a non super admin user, so it should catch missing
ability in the future.
 2026-03-11 15:34:27 +11:00
Gaetan Craig-Riou
dff9d7ede6 Merge pull request #14009 from openfoodfoundation/dependabot/npm_and_yarn/postcss-8.5.8 
Bump postcss from 8.5.6 to 8.5.8
 2026-03-11 10:32:14 +11:00
Gaetan Craig-Riou
210303de90 Merge pull request #14011 from openfoodfoundation/dependabot/bundler/flipper-ui-1.4.0 
Bump flipper-ui from 1.3.6 to 1.4.0
 2026-03-11 10:30:56 +11:00
Gaetan Craig-Riou
7a0eee121d Merge pull request #14010 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.6 
Bump @floating-ui/dom from 1.7.5 to 1.7.6
 2026-03-11 10:24:43 +11:00
Gaetan Craig-Riou
9816332601 Update all locales with the latest Transifex translations v5.4.5 2026-03-10 22:15:29 +11:00
Gaetan Craig-Riou
4810b02233 Merge pull request #13702 from marincarroll/improve-accessibility-of-admin-pagination 
Improve accessibility of admin pagination
 2026-03-10 22:12:57 +11:00
Gaetan Craig-Riou
f8716f8005 Merge pull request #13963 from rioug/13855-payment-with-credit 
Payment with credit
 2026-03-10 22:11:40 +11:00
dependabot[bot]
8064154a86 Bump flipper-ui from 1.3.6 to 1.4.0 
Bumps [flipper-ui](https://github.com/flippercloud/flipper) from 1.3.6 to 1.4.0.
- [Release notes](https://github.com/flippercloud/flipper/releases)
- [Changelog](https://github.com/flippercloud/flipper/blob/main/Changelog.md)
- [Commits](https://github.com/flippercloud/flipper/compare/v1.3.6...v1.4.0)

---
updated-dependencies:
- dependency-name: flipper-ui
  dependency-version: 1.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-10 09:34:57 +00:00
dependabot[bot]
c3051ea351 Bump @floating-ui/dom from 1.7.5 to 1.7.6 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.7.5 to 1.7.6.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.7.6/packages/dom)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-10 09:33:40 +00:00
dependabot[bot]
c850feeab8 Bump postcss from 8.5.6 to 8.5.8 
Bumps [postcss](https://github.com/postcss/postcss) from 8.5.6 to 8.5.8.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.5.6...8.5.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-10 09:33:21 +00:00
Gaetan Craig-Riou
5cf213f22a Fix failing spec 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
251a1acffc Clean up enterprise controller 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
d5dec05ab1 Remove payment method ApiCustomerCredit 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
7790259c27 Add transaction origin for internal credit payments 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
6a99d2a3c8 Add transaction origin in descriptiopn 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
e7a2b7ea48 Remove payment method from customer account transaction 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
bd0dcd99f3 Fix failing spec 
I wrongly fixed it due to my local database having rogue data
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
bc23423521 Remove the link between enterprise and internal payment method 
Enterprise have access to the internal payment method by default.
The access is handled at the application level so we don't have to
manage database links.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
a4ca56c7a5 Refactored internal payment method 
We now check on known payment method type, instead of using the internal
collumn.
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
9f7655852d Provide helper method to get internal payment method 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
ec106a8f83 Add new payment method ApiCustomerCredit 
It was previously modelled by a "Check" payment method
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
2e7237197a Refactor customer credit payment method 
Set fixed name and description
 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
25c579c478 Per review, small code fixes 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
66b820869c Add missing reference to spree_payments 2026-03-10 16:07:43 +11:00
Gaetan Craig-Riou
ffc819ea76 Linting migration 2026-03-10 16:07:43 +11:00