raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt-Yorkley
7181694401 Include the little search icon for dropdowns with a search box 2022-04-05 18:56:52 +01:00
Matt-Yorkley
7753d9e1ea Use TomSelect and dependent-select controller in admin order customer details form and remove ancient jQuery which uses global functions and inline scripts 
🎉
 2022-04-05 18:56:51 +01:00
Matt-Yorkley
be9156d40f Refactor dependant-selector further and (conditionally) update TomSelect if present 
I'm also introducing a convention here of adding a `private` comment to visually demarcate which methods are meant to be part of the public interface of the class and which aren't. The methods aren't *actually* private in any technical sense, it's just a bit of syntactic sugar to allow the intention to be communicated more clearly in the code's structure.
 2022-04-05 18:56:51 +01:00
Matt-Yorkley
09bd7126d8 Replace/remove a custom select2 Angular directive 2022-04-05 18:56:51 +01:00
Matt-Yorkley
9bce2ca64c Allow initializing with custom TomSelect configurations 2022-04-05 18:56:51 +01:00
Matt-Yorkley
fedfeb6dd3 Add dropdown "primary" style with blue instead of white 2022-04-05 18:56:51 +01:00
Matt-Yorkley
6459d9ea36 Replace some simple dropdowns 2022-04-05 18:56:51 +01:00
Matt-Yorkley
5e3e8c32c3 Create a simple Stimulus controller and add basic styling 2022-04-05 18:56:51 +01:00
Matt-Yorkley
ff3cc6e771 Add TomSelect package 2022-04-05 18:56:51 +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
Jean-Baptiste Bellet
20142ca632 Add a spec on canceling an order, and check email is sent 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-03-31 09:18:43 +02:00
jibees
8929fa4dcd Merge pull request #9042 from openfoodfoundation/transifex 
Transifex
 2022-03-30 10:27:58 +02:00
filipefurtad0
843f57ad4f Removes checkbox attributes 2022-03-29 22:29:43 +01:00
filipefurtad0
95b1911f38 Hides the default address checkbox for guest customers 2022-03-29 22:09:39 +01:00
filipefurtad0
f8b8298fbe Adds spec on billing address checkbox 2022-03-29 22:09:39 +01:00
Jean-Baptiste Bellet
6a48bdbb82 Send email cancelation by default 2022-03-29 10:12:00 +02:00
Transifex-Openfoodnetwork
85ff203e3f Updating translations for config/locales/en_FR.yml 2022-03-29 00:27:46 +11:00
Transifex-Openfoodnetwork
f229479a1e Updating translations for config/locales/en_US.yml 2022-03-29 00:24:41 +11:00
Transifex-Openfoodnetwork
10685b4ca2 Updating translations for config/locales/en_CA.yml 2022-03-29 00:24:38 +11:00
Filipe
729e9eda66 Merge pull request #9013 from cillian/fix-order-cycle-advanced-settings-close-button 
Fix order cycle advanced settings close button so it uses new remote toggle StimulusJs controller instead of old toggleSettings method
 2022-03-28 14:10:11 +01:00
Nihal Mohammed
b2613f3331 Add translations 2022-03-28 18:26:39 +05:30
Nihal Mohammed
5f2f5456a0 Add code to sort order by supplier when Enterprise user chooses to 2022-03-28 18:12:39 +05:30
Filipe
be1c255067 Merge pull request #8892 from Matt-Yorkley/spree-login-routes 
Fix issue with unconfirmed email messages
 2022-03-28 13:38:17 +01:00
Filipe
a516193ca8 Merge pull request #9025 from MrFuku/fix-flash-message 
Fix untranslated flash message
 2022-03-28 13:18:47 +01:00
Filipe
6a71be2a6b Merge pull request #9029 from cbordei/ofn-8459-missing-translation-for-model 
Added missing translation for model name.
 2022-03-28 12:54:24 +01:00
Transifex-Openfoodnetwork
1c2a60d543 Updating translations for config/locales/en_GB.yml 2022-03-28 19:59:34 +11:00