raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-24 05:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,107 Commits 15 Branches 458 Tags
ed331dc104f8f58f05a6755db2d3ab472bfd69bd
Commit Graph

35107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaetan Craig-Riou
bbbbe71bc4 Remove deprecated ~prefix 
https://github.com/webpack/sass-loader/blob/main/README.md#the-style-new-api-by-default-since-16-version-and-outputstyle-old-api-options-in-production-mode
 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
b3dc76b8cf Fix configuration and scss to get webpack to compile 
Move the Postcss config hack to postcss.config.js
 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
ad4b26e86d Add missing dependency for asset compilation 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
c2a7a89381 Move extensions configuration to webpack.config.js 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
68e3623861 Use default babel config, set up on package.json 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
577aa55f98 Move browserlist settings to package.json 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
b8e62b3d84 Add coffeeScript dependency 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
dbb8e07b9a Add Sass integration 
We are still using the old `ruby-sass` because it's a dependency from
`rails-sass` which is a dependcy from `select2`. It looks like the
master branch on the ofn fork get rid of the dependency, so we should
upgrading.
 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
19550ed4fe Add postcss integration 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
4d0c710e3b Add css integration 2026-01-06 14:31:32 +11:00
Gaetan Craig-Riou
fccde70690 Upgrading to webpacker v6.0.0.rc.6 
Migration guide : https://github.com/shakacode/shakapacker/blob/main/docs/v6_upgrade.md#how-to-upgrade-to-webpacker-v600rc6-from-v5
Setp 1,2,3,4
 2026-01-06 14:31:25 +11:00
Ahmed Ejaz
b8de75b1ef Add "None" option to tags filter and update search functionality 
- Implemented apply_tags_filter method to handle "None" option in tag searches.
- Updated tags select field to include "None" option in the filters.
- Enhanced search_by_tag method in specs  to accept multiple tags and raise an error if none are provided.
- Added tests for searching by "None" tag and combinations with other tags.
 2026-01-06 02:39:56 +05:00
Gaetan Craig-Riou
06bfd07fec Merge pull request #13824 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.16 
Bump trix from 2.1.15 to 2.1.16
 2026-01-05 11:12:11 +11:00
Maikel
e98cf78b4c Merge pull request #13819 from openfoodfoundation/dependabot/bundler/haml_lint-0.68.0 
Bump haml_lint from 0.67.0 to 0.68.0
 2026-01-02 16:50:21 +11:00
dependabot[bot]
13229cc0c1 Bump trix from 2.1.15 to 2.1.16 
Bumps [trix](https://github.com/basecamp/trix) from 2.1.15 to 2.1.16.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.15...v2.1.16)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-31 09:01:27 +00:00
Ahmed Ejaz
03b7c07495 Add tests for Select2AjaxController with AJAX functionality 2025-12-30 01:25:35 +05:00
Ahmed Ejaz
a3c08ceb7c Add AJAX search functionality for enterprise fees and related entities in reports 2025-12-30 01:25:25 +05:00
Konrad
e814fdd447 Remove test for active white labeling in test email as proposed by David 2025-12-29 12:36:50 +01:00
David Cook
4d6231105f Assign attribute directly instead of mocking 
It's better to set a variable the same way the real code would

Co-authored-by: Maikel <maikel@email.org.au>
 2025-12-29 12:18:55 +01:00
Konrad
3a75c3446e Update backorder mailer specs to check that these hub facing emails remain unaffected by white labelling (there are no customer facing emails here) 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
29a76fd721 Update report mailer specs to check that this enterprise facing email remains unaffected by white labelling (there are no customer facing emails here) 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
593bd89095 Update test mailer specs to check that this super admin facing email remains unaffected by white labelling (there are no user or customer facing emails here) 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
0079ed219b Update producer mailer specs to check that this producer facing email remains unaffected by white labelling (there are no customer facing emails here) 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
5957d99812 Update enterprise mailer specs to check that enterprise facing emails remain unaffected by white labelling (there are no customer facing emails here) 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
89453ec758 Update subscription mailer specs to check that customer facing emails are white labelled, while shop facing emails are not 
Also make use of the newly separated shared_examples

Made the check for link to order page more general, because on my system a double quote was expected but a single quote was generated
 2025-12-29 12:18:55 +01:00
Konrad
0de4f2f596 Update payment mailer specs to check that customer facing emails are white labelled, while shop facing emails are not 
Also make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
183cbecef6 Update shipment mailer specs to check that customer facing emails are white labelled (there are no shop facing emails here) 
Make use of the newly separated shared_examples
 2025-12-29 12:18:55 +01:00
Konrad
ab6a49e568 Update order mailer specs to check that customer facing emails are white labelled, while shop facing emails are not 
Also make use of the newly separated shared_examples

Including the invoice email was too tricky for me for now, sorry
 2025-12-29 12:18:55 +01:00
Konrad
52ddb29dc7 Update user mailer specs to check that white labelling does not affect these emails 
Move tests to separate file for reuse in other emails

Pass on :mail symbol and obtain the mail-object using public_send() to call it with different names
 2025-12-29 12:18:54 +01:00
drummer83
5ce7905a33 White labelling ALL customer facing emails 
White labelling added for Order: cancellation email, Order: invoice email, Shipment: shipped email, Subscriptions: authorize payment email, Subscriptions: placement email, Subscriptions: empty order email, Subscriptions: failed payment email

White labelling existed already for Order: confirmation email, Subscriptions: order confirmation email
 2025-12-29 12:18:54 +01:00
piyyu
0f59333cd9 Fix import multiple products button route 2025-12-26 02:10:46 +05:30
piyyu
ad4ce14486 Fix import multiple products button route 2025-12-26 00:11:09 +05:30
dependabot[bot]
3173c79e8f Bump haml_lint from 0.67.0 to 0.68.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.67.0 to 0.68.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.67.0...v0.68.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-22 09:04:24 +00:00
David Cook
ca14d557c1 Merge pull request #13814 from mkllnk/dfc-events-unauthorised 
Correctly respond to unauthorised requests on DFC events endpoint
 2025-12-22 10:42:23 +11:00
Gaetan Craig-Riou
59a3a5bd92 Merge pull request #13816 from openfoodfoundation/dependabot/bundler/dotenv-3.2.0 
Bump dotenv from 3.1.8 to 3.2.0
 2025-12-22 09:44:15 +11:00
dependabot[bot]
a226088f5c Bump dotenv from 3.1.8 to 3.2.0 
Bumps [dotenv](https://github.com/bkeepers/dotenv) from 3.1.8 to 3.2.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.1.8...v3.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-19 09:04:48 +00:00
Maikel Linke
e91fab5702 Remove legacy config for secret key 2025-12-19 14:22:25 +11:00
Maikel Linke
e09853af0c Replace deprecated Rails secrets 
Use new credentials interface.
 2025-12-19 13:28:05 +11:00
Maikel
c65fcc1072 Merge pull request #13812 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.208.0 
Bump aws-sdk-s3 from 1.207.0 to 1.208.0
 2025-12-19 10:41:27 +11:00
Maikel
3bb68ec07e Merge pull request #13811 from openfoodfoundation/dependabot/bundler/webmock-3.26.1 
Bump webmock from 3.25.1 to 3.26.1
 2025-12-19 10:39:45 +11:00
Maikel Linke
2c97638aa1 Enhance readability 2025-12-19 10:21:02 +11:00
Maikel Linke
ceee9671d9 Replace method with name conflict causing error 2025-12-19 10:16:46 +11:00
dependabot[bot]
6b494be7ff Bump aws-sdk-s3 from 1.207.0 to 1.208.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.207.0 to 1.208.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.208.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-18 19:38:08 +00:00
dependabot[bot]
a6855e6bc1 Bump webmock from 3.25.1 to 3.26.1 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.25.1 to 3.26.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.25.1...v3.26.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-17 09:01:49 +00:00
Gaetan Craig-Riou
7ca43eb4a1 Merge pull request #13810 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.207.0 
Bump aws-sdk-s3 from 1.206.0 to 1.207.0
 2025-12-17 10:21:50 +11:00
dependabot[bot]
74b5ac559f Bump aws-sdk-s3 from 1.206.0 to 1.207.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.206.0 to 1.207.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.207.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-12-16 09:02:51 +00:00
Maikel
07c236497c Merge pull request #13808 from openfoodfoundation/dependabot/bundler/vcr-6.3.1 
Bump vcr from 6.2.0 to 6.3.1
 2025-12-16 14:50:27 +11:00
Filipe
caf2ff9bb4 Merge pull request #13752 from deivid-rodriguez/always_generate_button_tags 
Always generate `<button>` tags, rather than `<input>` of type "button"
 2025-12-15 18:46:38 +00:00
Filipe
1b2a17d7e4 Merge pull request #13754 from deivid-rodriguez/no-changes-after-delete-customer 
Properly handle changes in `code` attribute when a customer is deleted
 2025-12-15 17:58:04 +00:00
Filipe
ce46115139 Merge pull request #13648 from deivid-rodriguez/improve-enterprise-removal 
Improve enterprise removal
 2025-12-15 16:54:05 +00:00