raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,883 Commits 21 Branches 450 Tags
c8b5ce64a472ba3e12e4033641e53ded1e7a4363
Commit Graph

23883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
c8b5ce64a4 Adds coverage for hiding payment methods with tags 2022-04-13 23:44:54 +01:00
Filipe
cbb9e01a25 Merge pull request #8884 from Matt-Yorkley/image-format-errors 
Patch keyword arguments syntax in Paperclip error handling
 2022-04-13 19:38:07 +01:00
Filipe
94bba56726 Merge pull request #9063 from georgethoppil/select-all-variants 
Add all variants for only one distributor
 2022-04-13 19:37:31 +01:00
Filipe
0cc056ab7f Merge pull request #9071 from Matt-Yorkley/permissions-query-improvements 
Improve permissions query building
 2022-04-13 19:23:13 +01:00
Filipe
6b1dd00dec Merge pull request #9011 from cillian/validate-subscription-quantity 
Don't allow subscriptions with no quantity to be saved
 2022-04-13 12:03:34 +01:00
Filipe
fbe378d3b9 Merge pull request #9074 from hmurali01/translate-shipping-method 
Fixed missing translation: "Shipping method"
 2022-04-13 11:01:16 +01:00
jibees
0d29fc78c3 Merge pull request #9089 from mkllnk/cuprite-host 
Include port in URLs generated by system specs
 2022-04-13 09:52:47 +02:00
Maikel Linke
4d8c44d890 Include port in URLs generated by system specs 
This means that we can follow generated links, for example in emails and
reach the test app server.
 2022-04-13 15:03:38 +10:00
Maikel
a4bffc61f1 Merge pull request #8997 from apricot12/8968-Group-products-by-supplier-P1 
Sort products by supplier in invoice
 2022-04-13 11:54:12 +10:00
Maikel
26d6969b5b Merge pull request #9045 from jibees/9043-send-email-cancelation-by-default 
Send cancellation email by default when cancelling an order
 2022-04-13 11:53:43 +10:00
Maikel
e6c65f524a Merge pull request #9033 from seballot/select2-multiple 
select2: improve style
 2022-04-13 09:37:13 +10:00
jibees
762b6fad65 Merge pull request #9079 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.21 
Bump @storybook/addon-docs from 6.4.20 to 6.4.21
 2022-04-12 14:14:47 +02:00
dependabot[bot]
48246117cd Bump @storybook/addon-docs from 6.4.20 to 6.4.21 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.20 to 6.4.21.
- [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.4.21/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>
 2022-04-12 11:53:50 +00:00
jibees
bf8186bb84 Merge pull request #9077 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.21 
Bump @storybook/addon-controls from 6.4.20 to 6.4.21
 2022-04-12 13:53:02 +02:00
Maikel
fd804d819e Merge pull request #9078 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.21 
Bump @storybook/server from 6.4.20 to 6.4.21
 2022-04-12 11:05:41 +10:00
Maikel Linke
5e0c901790 Improve spec of sorted line items 
The previous version wasn't actually testing the sorting option. There
was only one supplier and the items got sorted the same way in both
cases.
 2022-04-12 10:45:40 +10:00
Nihal Mohammed
48613a4b42 Add test for sorted_line_items 2022-04-11 20:11:32 +05:30
dependabot[bot]
1aed6d0ee6 Bump @storybook/server from 6.4.20 to 6.4.21 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.20 to 6.4.21.
- [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.4.21/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>
 2022-04-11 09:05:51 +00:00
dependabot[bot]
65faf33b87 Bump @storybook/addon-controls from 6.4.20 to 6.4.21 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.20 to 6.4.21.
- [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.4.21/addons/controls)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-11 09:05:36 +00:00
Jean-Baptiste Bellet
99161a19ea Update all locales with the latest Transifex translations v4.1.25 2022-04-11 09:43:00 +02:00
jibees
8b047cd449 Merge pull request #9073 from openfoodfoundation/transifex 
Transifex
 2022-04-11 09:36:08 +02:00
Transifex-Openfoodnetwork
b2b8ec8008 Updating translations for config/locales/ar.yml 2022-04-11 02:10:24 +10:00
Transifex-Openfoodnetwork
2087a17fa9 Updating translations for config/locales/de_DE.yml 2022-04-08 17:43:34 +10:00
Transifex-Openfoodnetwork
0eb77cf7d3 Updating translations for config/locales/en_FR.yml 2022-04-08 17:22:25 +10:00
Transifex-Openfoodnetwork
3fc71c0e99 Updating translations for config/locales/fr.yml 2022-04-08 17:21:35 +10:00
Filipe
afcdfce37d Merge pull request #8967 from mkllnk/api-customers-final 
Serve customers data via first API v1 endpoint in JSON:API format behind feature toggle
 2022-04-07 21:03:06 +01:00
hmurali01
d16b6fcad5 Fixed missing translation: "Shipping method" 2022-04-07 13:28:32 -04:00
Transifex-Openfoodnetwork
cb697599d4 Updating translations for config/locales/ru.yml 2022-04-07 19:12:28 +10:00
Maikel
d0a93fb512 Merge pull request #9070 from jibees/clean-yarn-lock-file 
Clean yarn.lock due to failed update
 2022-04-07 16:03:27 +10:00
Matt-Yorkley
eef59bbaae Improve permissions query building 
For larger queries and especially where filtering and paginating, these simpler product queries are way more efficient. It cuts out some very large subqueries with large lists of product ids.
 2022-04-05 22:28:09 +01:00
Jean-Baptiste Bellet
ad19142042 Clean yarn.lock 
Seems that dependant bot missed something at some point maybe from  #9061 or #9060
 2022-04-05 14:47:13 +02:00
Maikel
5470dc6c68 Merge pull request #9065 from openfoodfoundation/dependabot/npm_and_yarn/moment-2.29.2 
Bump moment from 2.29.1 to 2.29.2
 2022-04-05 11:21:49 +10:00
GeorgeThoppil
706f6025e9 Add all variants for only one distributor 2022-04-04 19:59:42 -04:00
jibees
ea12fcb45f Merge pull request #9061 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.20 
Bump @storybook/server from 6.4.19 to 6.4.20
 2022-04-04 15:51:21 +02:00
jibees
47c59e6172 Merge pull request #9060 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.20 
Bump @storybook/addon-controls from 6.4.19 to 6.4.20
 2022-04-04 15:51:13 +02:00
dependabot[bot]
5b6c23780e Bump @storybook/addon-controls from 6.4.19 to 6.4.20 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.19 to 6.4.20.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.20/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.20/addons/controls)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-04 13:15:54 +00:00
dependabot[bot]
374bc31a60 Bump @storybook/server from 6.4.19 to 6.4.20 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.19 to 6.4.20.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.20/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.20/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>
 2022-04-04 13:15:48 +00:00
jibees
d34ab71efa Merge pull request #9059 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.20 
Bump @storybook/addon-docs from 6.4.19 to 6.4.20
 2022-04-04 15:14:58 +02:00
dependabot[bot]
abdab5a22a Bump moment from 2.29.1 to 2.29.2 
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-04 09:04:59 +00:00
Maikel Linke
e726d2d736 Update translations v4.1.24 2022-04-04 10:40:10 +10:00
Maikel
044bf35c81 Merge pull request #9062 from openfoodfoundation/transifex 
Transifex
 2022-04-04 10:35:45 +10:00
Transifex-Openfoodnetwork
010b39b671 Updating translations for config/locales/en_FR.yml 2022-04-02 00:31:06 +11:00
Transifex-Openfoodnetwork
4079e61beb Updating translations for config/locales/fr.yml 2022-04-02 00:28:05 +11:00
Transifex-Openfoodnetwork
dc00221dc4 Updating translations for config/locales/de_DE.yml 2022-04-02 00:28:01 +11:00
Transifex-Openfoodnetwork
eef9dc346d Updating translations for config/locales/en_CA.yml 2022-04-02 00:24:54 +11:00
Filipe
f29dc3f978 Merge pull request #9009 from jibees/9007-already-opened-cart 
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
 2022-04-01 13:29:34 +01:00
dependabot[bot]
1a66c1148b Bump @storybook/addon-docs from 6.4.19 to 6.4.20 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.19 to 6.4.20.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.20/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.20/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>
 2022-04-01 09:04:16 +00:00
Filipe
c4fc8e9396 Merge pull request #8988 from jibees/8963-sc-display-save-shipping-address-as-default-checkbox 
SplitCheckout: Display checkbox that "save as default address" on the /details page
 2022-03-31 16:43:52 +01:00
Filipe
e2b1c0d93f Merge pull request #9004 from jibees/8999-filter-shipping-methods-with-tag 
SplitCheckout: filter shipping method with tag
 2022-03-31 12:09:06 +01:00
Filipe
71b6c129d6 Merge pull request #9021 from filipefurtad0/improves_guest_checkout 
[Split-Checkout] Hides "Save as default billing address" from guest-checkout
 2022-03-31 10:45:47 +01:00