raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,048 Commits 18 Branches 453 Tags
3daaa9d50b5e034dbe29ab964f56b9b91c14e382
Commit Graph

23048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Transifex-Openfoodnetwork
3daaa9d50b Updating translations for config/locales/es.yml 2022-01-15 05:45:15 +11:00
Transifex-Openfoodnetwork
93ecc894c6 Updating translations for config/locales/de_DE.yml 2022-01-14 07:09:03 +11:00
Transifex-Openfoodnetwork
f374186b8d Updating translations for config/locales/fr_CA.yml 2022-01-14 05:20:05 +11:00
Transifex-Openfoodnetwork
883e137a43 Updating translations for config/locales/en_CA.yml 2022-01-14 04:27:24 +11:00
Transifex-Openfoodnetwork
d89bfd30c9 Updating translations for config/locales/en_CA.yml 2022-01-14 03:57:37 +11:00
Transifex-Openfoodnetwork
646bd05973 Updating translations for config/locales/en_FR.yml 2022-01-13 23:00:00 +11:00
Transifex-Openfoodnetwork
2cc1b6a2f8 Updating translations for config/locales/fr.yml 2022-01-13 22:43:21 +11:00
Matt-Yorkley
fa06f30ebe Merge branch 'master' into transifex 2022-01-11 21:10:28 +00:00
Matt-Yorkley
80342e258b Update all locales with the latest Transifex translations 2022-01-11 20:34:55 +00:00
Filipe
d66dac4ccb Merge pull request #8621 from apricot12/Unit-value-shop-front 
Update units when variant unit name is edited
 2022-01-11 17:41:20 +00:00
Transifex-Openfoodnetwork
42c321850a Updating translations for config/locales/en_CA.yml 2022-01-12 00:27:40 +11:00
Transifex-Openfoodnetwork
00d8b2be1f Updating translations for config/locales/en_GB.yml 2022-01-12 00:27:38 +11:00
Transifex-Openfoodnetwork
c253a2f360 Updating translations for config/locales/en_FR.yml 2022-01-12 00:27:36 +11:00
Transifex-Openfoodnetwork
b944b53e99 Updating translations for config/locales/ru.yml 2022-01-12 00:24:38 +11:00
Transifex-Openfoodnetwork
3e9e159df2 Updating translations for config/locales/de_DE.yml 2022-01-12 00:24:32 +11:00
Transifex-Openfoodnetwork
db27639f0b Updating translations for config/locales/en_US.yml 2022-01-12 00:24:30 +11:00
Filipe
4978c95e75 Merge pull request #8467 from SarvarKh/validate-social-links 
Fix the issue with 'at' in enterprise twitter and instagram
 2022-01-11 12:53:11 +00:00
Filipe
f2b14beea9 Merge pull request #8541 from jibees/8506-improve-shiped-email 
Improve shipped email design
 2022-01-11 11:36:32 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name 
Enable sorting orders by order full name
 2022-01-11 11:27:36 +00:00
Transifex-Openfoodnetwork
f61ad4470d Updating translations for config/locales/en_GB.yml 2022-01-11 20:11:03 +11:00
Maikel
3480c5d931 Merge pull request #8654 from Matt-Yorkley/rails-defaults 
Apply recommended framework defaults
 2022-01-11 16:12:27 +11:00
Transifex-Openfoodnetwork
82ecadc17c Updating translations for config/locales/de_DE.yml 2022-01-11 09:30:24 +11:00
jibees
cc1e3912ad Merge pull request #8685 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.10 
Bump karma from 6.3.9 to 6.3.10
 2022-01-10 15:23:29 +01:00
dependabot[bot]
346ec9ef1d Bump karma from 6.3.9 to 6.3.10 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.9...v6.3.10)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-10 12:14:59 +00:00
Matt-Yorkley
fd4a18a838 Merge pull request #8680 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.7 
Bump jest from 27.4.6 to 27.4.7
 2022-01-10 12:11:12 +00:00
Transifex-Openfoodnetwork
228f6db139 Updating translations for config/locales/ru.yml 2022-01-10 18:53:37 +11:00
Filipe
54c61f459e Merge pull request #8677 from filipefurtad0/add_specs_split_checkout_1 
Migrates some test scenarios from checkout_spec.rb
 2022-01-09 16:20:41 +00:00
filipefurtad0
0af025d948 Re-writes test structure, descrive vs. context 2022-01-08 17:59:04 +00:00
Transifex-Openfoodnetwork
fbeb295019 Updating translations for config/locales/fr_CA.yml 2022-01-08 09:09:50 +11:00
Transifex-Openfoodnetwork
d4d4b70eb2 Updating translations for config/locales/en_CA.yml 2022-01-08 08:50:21 +11:00
Matt-Yorkley
f23a12020c Merge pull request #8675 from Matt-Yorkley/dead-code-spree-js 
Remove unused JS
 2022-01-07 14:29:24 +00:00
filipefurtad0
4276be1132 Simplifies/re-writes 'before do' block 2022-01-07 13:11:27 +00:00
filipefurtad0
e2c5c08c1e Updates the spec to reflect the changes in the helper 2022-01-07 13:06:28 +00:00
filipefurtad0
2df841f637 Renames module - removes 'request' naming 2022-01-07 13:03:44 +00:00
filipefurtad0
ebbc028dda Removes split_ prefix from helper 2022-01-07 12:56:15 +00:00
filipefurtad0
9149306fc1 Moves(up)/renames SplitCheckoutHelper 2022-01-07 12:55:09 +00:00
filipefurtad0
12d1e45e06 Fixes rubocop issues 2022-01-07 12:13:15 +00:00
filipefurtad0
9685bb6ae9 Adds tests for logged-in user scenarios 2022-01-07 12:13:15 +00:00
filipefurtad0
93478d4079 Adds split-checkout helper 2022-01-07 12:13:15 +00:00
filipefurtad0
447d146365 Adds test out of stock product redirect 2022-01-07 12:13:15 +00:00
Transifex-Openfoodnetwork
9c37cd68f8 Updating translations for config/locales/en_US.yml 2022-01-07 03:29:40 +11:00
dependabot[bot]
60e793b899 Bump jest from 27.4.6 to 27.4.7 
Bumps [jest](https://github.com/facebook/jest) from 27.4.6 to 27.4.7.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.6...v27.4.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-06 12:31:36 +00:00
Filipe
6f47619c5a Merge pull request #8659 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.0 
Bump jquery-ui from 1.10.4 to 1.13.0
 2022-01-06 12:28:34 +00:00
Filipe
f3ceffc4b6 Merge pull request #8662 from openfoodfoundation/dependabot/npm_and_yarn/select2-4.0.13 
Bump select2 from 3.4.5 to 4.0.13
 2022-01-06 12:22:44 +00:00
Matt-Yorkley
f42abe8268 Remove configs which are already enabled in framework defaults 2022-01-05 15:36:16 +00:00
Matt-Yorkley
8a0646704a Bump framework defaults to 6.1 2022-01-05 15:35:22 +00:00
Matt-Yorkley
b51891f1ab ActionMailer::MailDeliveryJob is the new default class for mailer handling 
ActionMailer::DeliveryJob is deprecated in favour of ActionMailer::MailDeliveryJob, and will be removed in Rails 7
 2022-01-05 15:35:22 +00:00
Matt-Yorkley
037c647336 Bump framework defaults to 6.0 2022-01-05 15:35:22 +00:00
Matt-Yorkley
973c60babd Disable some incompatible defaults 
Using `config.load_defaults` applies a large number of recommended config options, but some of them introduce breaking changes. By selectively disabling the ones that don't work nicely with OFN we can still get the benefits of all the other enabled options.

These options currently don't play nicely with OFN, and break the CI build in various places.
 2022-01-05 15:35:22 +00:00
Matt-Yorkley
a19335d247 Enable framework defaults for Rails 5.2 2022-01-05 15:35:22 +00:00