raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,173 Commits 19 Branches 453 Tags
0ae87b2252a0654686c796aaf2ecd3d7a67503a0
Commit Graph

22173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
0ae87b2252 Bump @storybook/server from 6.3.9 to 6.3.10 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 10:53:50 +00:00
Matt-Yorkley
a0bea5baa9 Merge pull request #8302 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.10 
Bump @storybook/addon-docs from 6.3.9 to 6.3.10
 2021-10-07 12:49:37 +02:00
Matt-Yorkley
58f7955c16 Merge pull request #8306 from openfoodfoundation/revert-8301-dependabot/npm_and_yarn/stimulus-3.0.1 
Revert "Bump stimulus from 2.0.0 to 3.0.1"
 2021-10-07 12:42:04 +02:00
Matt-Yorkley
200bf36604 Revert "Bump stimulus from 2.0.0 to 3.0.1" 2021-10-07 12:41:51 +02:00
Matt-Yorkley
4ecb646965 Merge pull request #8305 from openfoodfoundation/revert-8303-dependabot/npm_and_yarn/webpack-cli-4.9.0 
Revert "Bump webpack-cli from 3.3.12 to 4.9.0"
 2021-10-07 12:41:30 +02:00
Matt-Yorkley
9282d8e1e0 Revert "Bump webpack-cli from 3.3.12 to 4.9.0" 2021-10-07 12:41:14 +02:00
Matt-Yorkley
ba99824def Merge pull request #8301 from openfoodfoundation/dependabot/npm_and_yarn/stimulus-3.0.1 
Bump stimulus from 2.0.0 to 3.0.1
 2021-10-07 12:40:54 +02:00
Matt-Yorkley
87c679b7cc Merge pull request #8303 from openfoodfoundation/dependabot/npm_and_yarn/webpack-cli-4.9.0 
Bump webpack-cli from 3.3.12 to 4.9.0
 2021-10-07 12:39:08 +02:00
dependabot[bot]
832347a253 Bump webpack-cli from 3.3.12 to 4.9.0 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.9.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.9.0)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:54 +00:00
dependabot[bot]
9f1e1ee270 Bump @storybook/addon-docs from 6.3.9 to 6.3.10 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:21 +00:00
dependabot[bot]
a619d7b61d Bump stimulus from 2.0.0 to 3.0.1 
Bumps [stimulus](https://github.com/stimulusjs/stimulus) from 2.0.0 to 3.0.1.
- [Release notes](https://github.com/stimulusjs/stimulus/releases)
- [Changelog](https://github.com/hotwired/stimulus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusjs/stimulus/compare/v2.0.0...v3.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:05:58 +00:00
Andy Brett
fc7a25e287 Merge pull request #8290 from openfoodfoundation/dependabot/bundler/ffaker-2.20.0 
Bump ffaker from 2.19.0 to 2.20.0
 2021-10-06 10:55:23 -07:00
Andy Brett
5db1228aa6 Merge pull request #8278 from filipefurtad0/checkout_spec_into_system 
Updates checkout_spec into system
 2021-10-06 08:12:56 -07:00
Andy Brett
5da1c2f7bd Merge pull request #8288 from mkllnk/pending-changes 
Translate "Save Changes"
 2021-10-06 08:06:48 -07:00
Matt-Yorkley
805e12cffe Merge pull request #8291 from openfoodfoundation/dependabot/bundler/json-2.5.1 
Bump json from 1.8.6 to 2.5.1
 2021-10-06 11:48:44 +02:00
dependabot[bot]
8c244f2a6e Bump json from 1.8.6 to 2.5.1 
Bumps [json](https://github.com/flori/json) from 1.8.6 to 2.5.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v1.8.6...v2.5.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-06 09:04:17 +00:00
dependabot[bot]
2860576d09 Bump ffaker from 2.19.0 to 2.20.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.19.0...v2.20.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-06 09:02:50 +00:00
Matt-Yorkley
b53047e0e3 Merge pull request #8287 from mkllnk/fix-variant-filter 
Catch JS error on OC page
 2021-10-06 10:35:02 +02:00
Maikel Linke
5b9d5a6bce Avoid console error by catching potential fails 2021-10-06 15:51:43 +11:00
Maikel Linke
eb87cdeb1c Enable translation for "Save Changes" on customers page 2021-10-06 15:51:35 +11:00
Maikel Linke
129c4c92fa Catch JS error on OC page 
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.

Fixing this then revealed a missing require statement in a controller.
 2021-10-06 15:29:41 +11:00
filipefurtad0
6025d43f0d Updates checkout_spec into system 2021-10-06 13:34:59 +11:00
Andy Brett
7a49b304d1 Merge pull request #8279 from Matt-Yorkley/orphaned-adjustments 
Orphaned adjustments handing
 2021-10-05 17:19:58 -07:00
Andy Brett
c8419940bf Merge pull request #8264 from filipefurtad0/orders_spec_update_2 
Orders spec update
 2021-10-05 15:50:03 -07:00
Andy Brett
4169faccf9 Merge pull request #8283 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.4 
Bump mrujs from 0.5.3 to 0.5.4
 2021-10-05 15:35:34 -07:00
Maikel
ddd0034fff Merge pull request #8267 from filipefurtad0/fix_negative_assertion 
Switches assertion order
 2021-10-06 09:33:30 +11:00
filipefurtad0
18ff3f52b7 Moves spec from feature into system folder 2021-10-06 09:15:02 +11:00
filipefurtad0
076907d56b Changes spec config from feature into system 2021-10-06 09:15:02 +11:00
filipefurtad0
5c881431d3 Switches assertions order 2021-10-06 09:15:02 +11:00
Andy Brett
f3ef3bb052 Merge pull request #8270 from achauve/8161-fix-sorting-admin-orders-by-total 
Fix sorting admin orders by total
 2021-10-05 14:44:59 -07:00
Andy Brett
9b9db3202e Merge pull request #8277 from sinansonmez/8223-remove-ask-checkbox 
Ask checkboxes are removed from two pages
 2021-10-05 14:44:27 -07:00
Andy Brett
ce63d02a3d Merge pull request #8262 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.4 
Bump jest from 27.2.3 to 27.2.4
 2021-10-05 14:42:14 -07:00
Matt-Yorkley
19daf1d2fb Update adjustment unit tests 2021-10-05 22:40:37 +01:00
dependabot[bot]
765b6831a9 Bump mrujs from 0.5.3 to 0.5.4 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.5.3...v0.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-05 21:39:40 +00:00
Andy Brett
c2c9684e66 Merge pull request #8240 from mkllnk/fix-serializer-spec 
Load referenced lib class for independent spec run
 2021-10-05 14:34:40 -07:00
Andy Brett
a06326d15f Merge pull request #8239 from mkllnk/fix-reports-spec 
Fix order dependent reports spec
 2021-10-05 14:34:05 -07:00
Andy Brett
ec0bb63b42 Merge pull request #8179 from filipefurtad0/feature_into_system 
Feature into system specs
 2021-10-05 14:27:29 -07:00
Andy Brett
6aa24e4db3 Merge pull request #8248 from Matt-Yorkley/npm-pins 
Pin webpack packages to respective major versions
 2021-10-05 14:25:40 -07:00
Matt-Yorkley
9bd89ec1ce Merge pull request #8261 from Matt-Yorkley/bump-aws-sdk 
Bump aws-sdk to 2.2.0
 2021-10-05 19:43:49 +02:00
Matt-Yorkley
05ba7df54f Merge pull request #8263 from Matt-Yorkley/inventory-only-setting 
Fix display of "inventory only" radio buttons
 2021-10-05 19:21:55 +02:00
Matt-Yorkley
17c31a22bc Merge pull request #8260 from Matt-Yorkley/paperclip-uri-deprecation 
Fix deprecation in Paperclip
 2021-10-05 19:20:26 +02:00
Nihal M. Kelanthodika
4052aba00e Merge pull request #8245 from apricot12/Migrate-Migs-Payment-Method 2021-10-05 18:07:46 +05:30
dependabot[bot]
7c0b0bebf7 Bump jest from 27.2.3 to 27.2.4 
Bumps [jest](https://github.com/facebook/jest) from 27.2.3 to 27.2.4.
- [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.2.3...v27.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 20:09:36 +00:00
Andy Brett
5499d777aa Merge pull request #8276 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.9 
Bump @storybook/addon-docs from 6.3.8 to 6.3.9
 2021-10-04 13:03:45 -07:00
dependabot[bot]
af133930c8 Bump @storybook/addon-docs from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 19:22:41 +00:00
Andy Brett
407c4de406 Merge pull request #8272 from openfoodfoundation/dependabot/bundler/jwt-2.3.0 
Bump jwt from 2.2.3 to 2.3.0
 2021-10-04 11:37:43 -07:00
Andy Brett
ebb52510b5 Merge pull request #8275 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.9 
Bump @storybook/addon-controls from 6.3.8 to 6.3.9
 2021-10-04 11:22:05 -07:00
Andy Brett
291e2ca968 Merge pull request #8274 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.9 
Bump @storybook/server from 6.3.8 to 6.3.9
 2021-10-04 11:21:35 -07:00
Andy Brett
3b930fe6f7 Merge pull request #8273 from openfoodfoundation/dependabot/bundler/rubocop-1.22.1 
Bump rubocop from 1.22.0 to 1.22.1
 2021-10-04 11:21:01 -07:00
Matt-Yorkley
65f08ee8f4 Deal with edge cases where an adjustment is left referencing a deleted item 2021-10-04 17:55:27 +01:00