raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,997 Commits 16 Branches 456 Tags
89aa76dbbc61cd7878abc24ac934fa69a9b39820
Commit Graph

23997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
89aa76dbbc Handle long payment description with no space 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
4635e67707 Create mixins to force wrap 
No need to pre-wrap since we break-word
 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
99c0416cc7 Handle long shipping method description with no spaces 2022-04-28 10:40:28 +02:00
jibees
335de1d038 Merge pull request #9121 from openfoodfoundation/transifex 
Transifex
 2022-04-28 10:10:13 +02:00
Transifex-Openfoodnetwork
5b9a5c1df6 Updating translations for config/locales/fr_CA.yml 2022-04-28 07:38:59 +10:00
Transifex-Openfoodnetwork
72641ba317 Updating translations for config/locales/en_CA.yml 2022-04-28 07:26:44 +10:00
Transifex-Openfoodnetwork
8330339046 Updating translations for config/locales/en_FR.yml 2022-04-22 23:23:38 +10:00
Transifex-Openfoodnetwork
e34d4c773c Updating translations for config/locales/fr.yml 2022-04-22 23:20:59 +10:00
Transifex-Openfoodnetwork
e669ed9620 Updating translations for config/locales/nb.yml 2022-04-22 23:04:37 +10:00
Jean-Baptiste Bellet
6262dc3a2e Update all locales with the latest Transifex translations v4.1.27 2022-04-22 12:09:03 +02:00
Filipe
cb540d66c6 Merge pull request #9084 from jibees/9046-property-filter-on-shopfront 
Fix an issue which prevented filtering by properties and sorting by category on a shopfront.
 2022-04-22 11:03:31 +01:00
Filipe
1f80c2add4 Merge pull request #9087 from georgethoppil/enterprise-invisible 
Change enterprise visibility scope
 2022-04-22 10:52:32 +01:00
GeorgeThoppil
898c470c00 Change enterprise visibility scope 2022-04-21 20:27:28 -04:00
jibees
413c97cfa8 Merge pull request #9118 from openfoodfoundation/transifex 
Transifex
 2022-04-21 15:45:44 +02:00
Transifex-Openfoodnetwork
2b4d9be907 Updating translations for config/locales/fr.yml 2022-04-21 23:27:52 +10:00
Transifex-Openfoodnetwork
8f9c50a311 Updating translations for config/locales/it.yml 2022-04-21 23:24:47 +10:00
Filipe
4ea1dd68af Merge pull request #9023 from apricot12/8908-Access-Enterprise-perms-from-setting-page 
Enterprise can access permissions from enterprise edit page
 2022-04-21 13:21:27 +01:00
jibees
9cb3dc4c42 Merge pull request #9102 from openfoodfoundation/transifex 
Transifex
 2022-04-21 13:44:26 +02:00
Filipe
2ddc64ce4d Merge pull request #9072 from mkllnk/remove-taxon-icons 
Remove unused icons from Spree::Taxon
 2022-04-21 11:46:57 +01:00
Transifex-Openfoodnetwork
1aae8bba99 Updating translations for config/locales/it.yml 2022-04-21 20:35:27 +10:00
Jean-Baptiste Bellet
3e5656e638 Remove distinct to make proper ORDER BY 
Update specs as well to test match array and test duplication by adding property2 to product1
 2022-04-21 11:03:22 +02:00
Jean-Baptiste Bellet
96f267eefe Create specs for filtering by properties when sorting is available 
+ update product, supplier, taxon name to be more precise
 2022-04-21 11:03:22 +02:00
Maikel
30e68450d2 Merge pull request #9116 from openfoodfoundation/dependabot/npm_and_yarn/babel-loader-8.2.5 
Bump babel-loader from 8.2.4 to 8.2.5
 2022-04-21 11:11:43 +10:00
Maikel
2b3db15505 Merge pull request #9115 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.19 
Bump karma from 6.3.18 to 6.3.19
 2022-04-21 11:10:24 +10:00
Transifex-Openfoodnetwork
99beacf723 Updating translations for config/locales/en_FR.yml 2022-04-21 01:39:08 +10:00
Transifex-Openfoodnetwork
67453de649 Updating translations for config/locales/fr.yml 2022-04-21 01:38:45 +10:00
Filipe
f516b7056d Merge pull request #8863 from georgethoppil/payment-state-cancel-subscription-order 
Setting payment state for subscription order
 2022-04-20 13:14:57 +01:00
Filipe
1f6b5ef309 Merge pull request #8979 from jibees/6300-dont-submit-form-element-that-are-not-handled-by-backend 
shipping fees on admin: avoid backend error when updating calculator type
 2022-04-20 12:23:32 +01:00
dependabot[bot]
7528e878dc Bump babel-loader from 8.2.4 to 8.2.5 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.4 to 8.2.5.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.4...v8.2.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-20 09:06:14 +00:00
dependabot[bot]
2981c35482 Bump karma from 6.3.18 to 6.3.19 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.18 to 6.3.19.
- [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.18...v6.3.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-20 09:05:58 +00:00
Maikel
06dbb3b545 Merge pull request #9108 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.0.1 
Bump tom-select from 2.0.0 to 2.0.1
 2022-04-20 14:46:41 +10:00
Maikel
2da7e9ab44 Merge pull request #9107 from openfoodfoundation/dependabot/npm_and_yarn/moment-2.29.3 
Bump moment from 2.29.2 to 2.29.3
 2022-04-20 14:45:09 +10:00
Maikel
a145b97c28 Merge pull request #9103 from jibees/add-customer-id-to-order-endpoint-on-api 
API: Add customer_id as an attribute to the GET /orders/ORDER_ID endpoint
 2022-04-20 14:28:31 +10:00
Maikel
3985c9fb06 Merge pull request #9094 from openfoodfoundation/dependabot/npm_and_yarn/flatpickr-4.6.13 
Bump flatpickr from 4.6.11 to 4.6.13
 2022-04-20 14:24:49 +10:00
Maikel
67d3bd7414 Merge pull request #9040 from cillian/stimulus-js-help-modals 
Switch help modals from angular templates to use ViewComponent and StimulusJs
 2022-04-20 12:14:41 +10:00
Cillian O'Ruanaidh
4162830bee Switch help modals from angular templates to use ViewComponent and StimulusJs 2022-04-20 09:36:30 +10:00
Jean-Baptiste Bellet
e607d5c161 Shipping method: disabled form element to not submit them 
As they're not handled by the backend
 2022-04-19 15:16:07 +02:00
Jean-Baptiste Bellet
4b629eae11 Test that fee can be updated from weight to Flat Rate 
+ Missing some spree i18n keys
 2022-04-19 14:28:18 +02:00
Jean-Baptiste Bellet
6f5dd5ab0c Prepare to receive another test in the same context 2022-04-19 14:28:18 +02:00
Jean-Baptiste Bellet
a6c69c8530 Ensure that form element are well disabled to not submit them 
As they're not handled by the backend
 2022-04-19 14:28:18 +02:00
Transifex-Openfoodnetwork
6276a90258 Updating translations for config/locales/en_FR.yml 2022-04-19 18:27:52 +10:00
Transifex-Openfoodnetwork
4a65333a83 Updating translations for config/locales/fr.yml 2022-04-19 18:27:25 +10:00
Maikel
268a73a41d Merge pull request #9104 from jibees/get-rid-of-rubocop-MissingSuper-warning-on-ViewComponent-class 
Exclude ViewComponents from Rubocop MissingSuper rule
 2022-04-19 10:41:08 +10:00
Filipe
4dde49c881 Merge pull request #8991 from jibees/8985-Make-checkbox-for-Send-a-cancellation-email-to-the-customer-checked-by-default 
Admin, editing order, on last item deletion modal: "Send a cancellation email to the customer" checked by default
 2022-04-18 14:04:08 +01:00
Filipe
f831154b6f Merge pull request #8950 from jibees/5903-delete-coordinators_fees-linked-to-cloned-OC 
Delete linked coordinators fees when deleting an order cycle
 2022-04-18 11:55:53 +01:00
dependabot[bot]
91448c18f2 Bump tom-select from 2.0.0 to 2.0.1 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.0.0...v2.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-18 09:05:16 +00:00
dependabot[bot]
d82f7c3c4d Bump moment from 2.29.2 to 2.29.3 
Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.3)

---
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-18 09:05:03 +00:00
Transifex-Openfoodnetwork
7516cf6de3 Updating translations for config/locales/ar.yml 2022-04-17 04:18:27 +10:00
Transifex-Openfoodnetwork
0c2a3a9bb6 Updating translations for config/locales/de_DE.yml 2022-04-16 23:20:42 +10:00
Filipe
01e915800e Merge pull request #9037 from jibees/9028-last-item-of-order-cancellation 
BOM: show custom modal on last item deletion of an order
 2022-04-15 18:47:51 +01:00