raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,678 Commits 18 Branches 452 Tags
0cc4e5728ed3f32d987d31bcd2af041819dcfecd
Commit Graph

22678 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
0cc4e5728e Reference product attributes for sorting correctly 
The previous version failed in some cases as it relied on a table name
generated by Rails.
 2021-12-15 15:23:52 +11:00
Jean-Baptiste Bellet
cad8d8316d Improve variant order when searching 2021-12-07 11:37:39 +01:00
Jean-Baptiste Bellet
1b6cfb60a1 Searching variants should order results by variants display name 2021-12-07 11:18:20 +01:00
Jean-Baptiste Bellet
12f7935a26 Add needed Helper to handle create 2021-12-07 11:18:20 +01:00
Jean-Baptiste Bellet
31cc2549ed Order variant search by display_name 2021-12-07 11:18:20 +01:00
Matt-Yorkley
dcad00d047 Merge pull request #8484 from Matt-Yorkley/stripe-session-checks 
Stripe checkout alerting
 2021-12-05 12:04:00 +00:00
jibees
9590b15f50 Merge pull request #8550 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.3 
Bump jest from 27.3.1 to 27.4.3
 2021-12-03 09:32:13 +01:00
Matt-Yorkley
6e905bd2fc Merge pull request #8561 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.2 
Bump mrujs from 0.7.1 to 0.7.2
 2021-12-03 01:11:59 +00:00
Filipe
89864395ca Merge pull request #8520 from seballot/multiple-flash-messages 
Fix rendering problem with multiple flash messages in the admin section
 2021-12-03 01:05:36 +00:00
Filipe
b2e5a89395 Merge pull request #8487 from jibees/7278-multipe-stripe-form-in-admin-section 
Allow mutiple stripe form in the admin section
 2021-12-03 00:21:03 +00:00
dependabot[bot]
6aa0a9864d Bump mrujs from 0.7.1 to 0.7.2 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.1 to 0.7.2.
- [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.7.1...v0.7.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 21:22:09 +00:00
Matt-Yorkley
d2f542032e Update all locales with the latest Transifex translations 2021-12-02 21:20:26 +00:00
Matt-Yorkley
639ff6730f Merge pull request #8558 from openfoodfoundation/transifex 
Transifex
 2021-12-02 21:15:16 +00:00
Matt-Yorkley
e533973ecd Merge pull request #8513 from jibees/run-rubocop-with-reviewdog 
Run rubocop with reviewdog
 2021-12-02 21:14:04 +00:00
Matt-Yorkley
5f4c24f44d Merge pull request #8522 from seballot/vscode 
gitignore vscode editor folder
 2021-12-02 21:13:45 +00:00
Matt-Yorkley
684143cd46 Merge pull request #8515 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.1.0 
Bump @hotwired/turbo from 7.0.1 to 7.1.0
 2021-12-02 21:13:31 +00:00
Transifex-Openfoodnetwork
2a9a92dd6c Updating translations for config/locales/en_IE.yml 2021-12-03 04:30:38 +11:00
Filipe
f56dc2e284 Merge pull request #8517 from openfoodfoundation/chore-remove-deprecated-application.yml 
Remove references to deprecated application.yml config file.
 2021-12-02 10:54:08 +00:00
Filipe
ff485314a4 Merge pull request #8526 from jibees/3584-fix-adjustment-on-voiding-payment 
Revoke transaction fee if payment is cancelled
 2021-12-02 10:44:08 +00:00
dependabot[bot]
b28942b2eb Bump jest from 27.3.1 to 27.4.3 
Bumps [jest](https://github.com/facebook/jest) from 27.3.1 to 27.4.3.
- [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.3.1...v27.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-02 04:52:17 +00:00
Maikel
d0625e99c7 Merge pull request #8545 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.3 
Bump @storybook/addon-docs from 6.4.1 to 6.4.3
 2021-12-02 15:47:40 +11:00
Adrien Chauve
8585c68691 Remove occurences of application.yml.example 2021-12-01 18:39:26 +01:00
Adrien Chauve
2095024f48 Don't git-ignore application.yml any more 2021-12-01 18:37:26 +01:00
Adrien Chauve
abf1b54364 Fix environment variables loading when running whenever 2021-12-01 18:34:39 +01:00
dependabot[bot]
26c711f095 Bump @storybook/addon-docs from 6.4.1 to 6.4.3 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.1 to 6.4.3.
- [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.3/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-12-01 09:09:59 +00:00
Maikel
97751763a7 Merge pull request #8536 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.1 
Bump @storybook/addon-docs from 6.3.12 to 6.4.1
 2021-12-01 15:06:27 +11:00
dependabot[bot]
a58fd7a388 Bump @storybook/addon-docs from 6.3.12 to 6.4.1 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.12 to 6.4.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.1/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.1/addons/docs)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-01 03:36:53 +00:00
Maikel
74b81febe0 Merge pull request #8535 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.1 
Bump @storybook/addon-controls from 6.3.12 to 6.4.1
 2021-12-01 14:33:03 +11:00
dependabot[bot]
108aed21bc Bump @storybook/addon-controls from 6.3.12 to 6.4.1 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.12 to 6.4.1.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.4.1/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.4.1/addons/controls)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-30 09:06:18 +00:00
Jean-Baptiste Bellet
58ea420626 Voiding a payment should revoke any payment fees 
... and create a new one if a new payment is then linked to the order.
 2021-11-30 09:42:10 +01:00
Matt-Yorkley
64fd8da742 Merge pull request #8531 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.7.1 
Bump mrujs from 0.6.0 to 0.7.1
 2021-11-29 15:53:56 +00:00
Jean-Baptiste Bellet
59eb91c7c8 Remove id "card-element" as well 2021-11-29 10:18:06 +01:00
dependabot[bot]
87da55abb7 Bump mrujs from 0.6.0 to 0.7.1 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.6.0 to 0.7.1.
- [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.6.0...v0.7.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-29 09:08:30 +00:00
Jean-Baptiste Bellet
57a94d64f2 Revoke adjustment if payment is cancelled 2021-11-26 16:31:25 +01:00
Sebastian Castro
c9952eb372 gitignore vscode editor folder 2021-11-26 11:40:50 +01:00
Sebastian Castro
588420ff93 Fixs #8442 display multiple flash messages correctly 2021-11-26 11:38:43 +01:00
Jean-Baptiste Bellet
7ef976a52a Update all locales with the latest Transifex translations v4.1.9 2021-11-25 13:47:09 +01:00
jibees
fed893eba8 Merge pull request #8504 from openfoodfoundation/transifex 
Transifex
 2021-11-25 13:43:21 +01:00
jibees
b39d3bb7de Merge pull request #8492 from shveikus/8479-tab-behaviour-for-login-modal 
Update TAB behavior for the login modal
 2021-11-25 13:42:25 +01:00
jibees
76176b2482 Merge pull request #8498 from drummer83/drummer83-country_first 
Switch the order of 'state' and 'country' input fields
 2021-11-25 13:41:46 +01:00
jibees
439f4ad24c Merge pull request #8497 from drummer83/drummer83-localize_button 
Place the localize button above the map/below the address
 2021-11-25 13:41:19 +01:00
Nihal M. Kelanthodika
74b87adee3 Merge pull request #8500 from apricot12/8495-Variant-unit-name-shopfront 2021-11-25 16:06:06 +05:30
dependabot[bot]
8a05351a97 Bump @hotwired/turbo from 7.0.1 to 7.1.0 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.0.1 to 7.1.0.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.0.1...v7.1.0)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-25 09:07:39 +00:00
jibees
2f3d2952d0 Merge pull request #8510 from openfoodfoundation/release-task 
Add more detail to the release task template
 2021-11-25 09:19:20 +01:00
Maikel
6ff7acd496 Merge pull request #8508 from openfoodfoundation/mkllnk-rails-tutorials-link 
Direct beginners to Rails tutorials
 2021-11-25 16:51:49 +11:00
Transifex-Openfoodnetwork
d3131d6e23 Updating translations for config/locales/de_DE.yml 2021-11-25 10:04:12 +11:00
Transifex-Openfoodnetwork
ce69dbd016 Updating translations for config/locales/ru.yml 2021-11-25 07:39:36 +11:00
Adrien Chauve
051950e04c Remove references to deprecated application.yml config file. 
Point to .env and other .env.* config files.
 2021-11-24 15:11:00 +01:00
Jean-Baptiste Bellet
1f74ded192 run rubocop view reviewdog 2021-11-24 09:25:42 +01:00
Nihal M. Kelanthodika
aefb580023 Update unit_to_display spec 2021-11-23 12:59:42 +05:30