raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,081 Commits 16 Branches 456 Tags
d2c2e208226ecf3b5ca7fbac0e29552afb0d5099
Commit Graph

31081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
d2c2e20822 Removes #connect.pane files 
_learn and _connect seem to appear at the top of the homepage (and not as pane). Also, there was some hard coded URLs which seems not to be used, as the translations in the Configuration/Content section seem to work correctly.
 2024-04-15 15:05:53 +01:00
filipefurtad0
269811584b Updates file to latest state 
Deletes file

We only needed this file for tracking progress, during review, we should not keep it in master I think
 2024-04-15 15:05:53 +01:00
filipefurtad0
83c74bcc77 Updates existing translation on master 
Done to prevent/fix merge conflicts
 2024-04-15 15:05:53 +01:00
filipefurtad0
f08c1ca51d Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
4a7cb601e6 Added missing keys 
Adds string to missing key

To be squashed
 2024-04-15 15:05:53 +01:00
filipefurtad0
579357dcfa Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
08ccdf07c9 Adds missing key thank_you_for_your_order 2024-04-15 15:05:53 +01:00
filipefurtad0
a2a951a18e Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
8a9b728ac7 Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
8f07ff49ac Adds missing keys 2024-04-15 15:05:53 +01:00
filipefurtad0
8ca019d00c updates missing translations txt file 2024-04-15 15:05:53 +01:00
filipefurtad0
eb82e30cf6 Adds keys spree.editing_state and spree.back_to_states_list 2024-04-15 15:05:53 +01:00
filipefurtad0
b1e10f3dd4 Replaces missing by existing key 
I'm not sure how to trigger this error, and triggering an update error message seems appropriate too - it's sort of an edge case, perhaps this is a valid approach
 2024-04-15 15:05:53 +01:00
filipefurtad0
acc036b1d7 Removes missing payement message 
I've checked staging, and I could not find this message, nor the entry in the en.yml file - I think we're not rendering this message currently, hence, the removal.
 2024-04-15 15:05:53 +01:00
filipefurtad0
e182365006 Replaces missing keys by existing ones 2024-04-15 15:05:53 +01:00
filipefurtad0
9926b65bd9 Removes unused haml file 2024-04-15 15:05:53 +01:00
filipefurtad0
8db716f047 Adds missing key card_type_is 2024-04-15 15:05:53 +01:00
filipefurtad0
3e27a34971 Adds missing key instance_publishable_key 2024-04-15 15:05:53 +01:00
filipefurtad0
5420910907 Adds output from i18n-tasks on missing keys 2024-04-15 15:05:53 +01:00
Gaetan Craig-Riou
4de1905e73 Merge pull request #12371 from mkllnk/suggest-rubocop-extensions 
Let Rubocop suggest extensions
 2024-04-15 10:04:36 +10:00
Maikel Linke
97eef4cfcd Update all locales with the latest Transifex translations v4.4.39 2024-04-12 14:05:46 +10:00
Maikel Linke
cac9b515e0 Let Rubocop suggest extensions 
We are using all suggested extensions already and it's not suggesting
anything at the moment. Using the default value for suggesting
extensions will mean that Rubocop will tell us when there's a new
recommended extension for our code base.
 2024-04-12 12:06:31 +10:00
Maikel
9bb27aeac7 Merge pull request #12353 from filipefurtad0/regression_spec_#12343_improvement 
Improves regression spec after reviewer feedback
 2024-04-12 12:04:04 +10:00
Maikel
4109650509 Merge pull request #12364 from openfoodfoundation/dependabot/bundler/rubocop-1.63.1 
chore(deps-dev): bump rubocop from 1.63.0 to 1.63.1
 2024-04-12 12:02:36 +10:00
Maikel
03dffa5c96 Merge pull request #12367 from openfoodfoundation/dependabot/bundler/devise-4.9.4 
chore(deps): bump devise from 4.9.3 to 4.9.4
 2024-04-12 11:58:04 +10:00
Maikel
bdd47f27b8 Merge pull request #12368 from openfoodfoundation/dependabot/bundler/datafoodconsortium-connector-1.0.0.pre.alpha.12 
chore(deps): bump datafoodconsortium-connector from 1.0.0.pre.alpha.11 to 1.0.0.pre.alpha.12
 2024-04-12 11:57:03 +10:00
filipefurtad0
fd54a12bcb Moves methods to end of the file 2024-04-11 12:36:47 +01:00
filipefurtad0
f4108e97c7 Improves regression spec after reviewer feedback 
Removes shared_examples, defines a separate method

Removes pending to bring spec to green
 2024-04-11 12:33:10 +01:00
Konrad
27a4202fa4 Merge pull request #12357 from mkllnk/fix-invoice-order 
Fix: preserve order of invoices in bulk print
 2024-04-11 12:47:14 +02:00
dependabot[bot]
5ec1418eff chore(deps): bump datafoodconsortium-connector 
Bumps [datafoodconsortium-connector](https://github.com/datafoodconsortium/connector-ruby) from 1.0.0.pre.alpha.11 to 1.0.0.pre.alpha.12.
- [Release notes](https://github.com/datafoodconsortium/connector-ruby/releases)
- [Changelog](https://github.com/datafoodconsortium/connector-ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/datafoodconsortium/connector-ruby/compare/v1.0.0-alpha.11...v1.0.0-alpha.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 10:25:29 +00:00
dependabot[bot]
38f97ffc8e chore(deps): bump devise from 4.9.3 to 4.9.4 
Bumps [devise](https://github.com/heartcombo/devise) from 4.9.3 to 4.9.4.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.3...v4.9.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 10:23:21 +00:00
dependabot[bot]
4d94826516 chore(deps-dev): bump rubocop from 1.63.0 to 1.63.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.0 to 1.63.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.63.0...v1.63.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-04-11 10:11:45 +00:00
Maikel
dc7c5b6748 Merge pull request #12359 from openfoodfoundation/dependabot/bundler/stripe-10.15.0 
chore(deps): bump stripe from 10.14.0 to 10.15.0
 2024-04-11 16:25:04 +10:00
Maikel
082b1f9411 Merge pull request #12300 from mkllnk/checkout-steps 
Remove unnecessary method checkout_steps
 2024-04-11 15:57:45 +10:00
David Cook
5554eee0d1 Merge pull request #12354 from openfoodfoundation/dependabot/npm_and_yarn/tar-6.2.1 
chore(deps): bump tar from 6.1.11 to 6.2.1
 2024-04-11 11:49:33 +10:00
Maikel Linke
34fc6283b8 Remove unused code 2024-04-11 11:46:52 +10:00
Maikel Linke
2f3b8c8573 Re-record Stripe cassettes 2024-04-11 11:45:14 +10:00
David Cook
3318c2622d Merge pull request #12352 from cyrillefr/FixRailsWhereEquals 
Fix rubocop FixRailsWhereEquals
 2024-04-11 11:43:03 +10:00
Maikel
f6dbb78686 Merge pull request #12360 from openfoodfoundation/dependabot/bundler/spring-4.2.0 
chore(deps-dev): bump spring from 4.1.3 to 4.2.0
 2024-04-11 11:40:19 +10:00
David Cook
a94901fc99 Merge pull request #12358 from openfoodfoundation/dependabot/bundler/valid_email2-5.2.3 
chore(deps): bump valid_email2 from 5.2.1 to 5.2.3
 2024-04-11 11:28:08 +10:00
dependabot[bot]
0be720dcb1 chore(deps): bump tar from 6.1.11 to 6.2.1 
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.11...v6.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 01:27:41 +00:00
Maikel
1459c9ee94 Merge pull request #12345 from chahmedejaz/task/12332-fix-rubocop-locale-errors 
Fix Rubocop Locale Errors
 2024-04-11 11:24:30 +10:00
Maikel Linke
c2c7910357 Reset I18n.local for each spec 
This avoids a locale setting leaking from one spec to another. It also
means that we don't have to reset the locale in individual specs.

Also:

- `cookies` is reset automatically and we don't need to do that.
- Removed some unused code (German number format and helper methods).
 2024-04-11 10:14:52 +10:00
Ahmed Ejaz
b2172ef8d8 12332 - Add around block to apply default_locale on specs 2024-04-11 10:14:52 +10:00
Ahmed Ejaz
ec61cff387 12332 - Fix rubocop Rails/I18nLocaleTexts errors 
- Add en locales for the hardcodded strings
 2024-04-11 10:14:50 +10:00
Ahmed Ejaz
693b9bd171 12332 - Fix rubocop Rails/I18nLocaleAssignment errors 
- use I18n.with_locale method rather than direct locale assignment
 2024-04-11 10:13:50 +10:00
Filipe
89033579bd Merge pull request #12328 from dacook/buu/remove-stimulus-reflex 
[BUU] Remove Stimulus Reflex from Products screen
 2024-04-10 21:59:59 +01:00
Konrad
b3dd51d6ac Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable 
Fix Rubocop Rails/HelperInstanceVariable
 2024-04-10 20:17:06 +02:00
David Cook
1425d524b9 Fix product filtering 
Merges change from fb09a7f1e6
 2024-04-10 15:17:56 +01:00
David Cook
e78ef120f4 TODO 
I think this case got lost.
 2024-04-10 15:17:56 +01:00