raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-25 05:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,369 Commits 15 Branches 458 Tags
a36b7ce01ac4aa2bcccb2f83ec6eadcb6b7b06fd
Commit Graph

34369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Bellet
57dc10888c Improve shipped email design 
- Use default class for header, content
 - Use monospace font for the list of the items
 - Add line breaks for the list of the items
 2021-11-30 17:02:42 +01:00
Jean-Baptiste Bellet
9bc7343420 Create a mailer preview for the shipped email 
Available on http://localhost:3000/rails/mailers/spree/shipment/shipped
 2021-11-30 16:55:07 +01: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
François Turbelin
58d54aa4ec Fix Webpacker container configuration 2021-11-26 09:22:18 +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
SarvarKhalimov
5d36c66aff Update follow partial to reflect social urls correctly 2021-11-25 01:05:45 +05: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
Maikel Linke
1da9dbc53e Add more detail to the release task 
New developers need a bit more guidance. And it's actually quite handy
for me, too.

We may want to remove duplication between this document and the wiki.
 2021-11-23 17:21:37 +11:00
Maikel
5f87c30d3e Merge pull request #8465 from jibees/7963-permission-to-delete-relationship-both-ways 
Manager can delete enterprises relationship in both direction
 2021-11-23 09:20:32 +11:00
shveikus
9e75e0e65c Add spec for logging using keyboard 2021-11-22 23:40:22 +03:00
Dmitry Shveikus
9bd604cbe9 Update TAB behaviour for login modal 2021-11-22 23:40:22 +03:00
Jean-Baptiste Bellet
b6afdb13fc Use timeout to put in other callback and then update the StatusMessage 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5575697c9f Add a directive attribute 'selected' that update AdminStripeElements when true 
Filled with `PaymentCtrl.isSelected(payment_method_id)`

Therefore, each time a stripe payment is selected, the one that is actually selected is linked to `AdminStripeElements.card` and `AdminStripeElements.stripe`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5348d26054 Add new "error" attribute in the StatusMessage 
It is used by `admin/payments/services/stripe_elements.js.coffee`
 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
36c12a92f2 Display errors on the right specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
fc779e0237 Mount Stripe element to the specific DOM element 2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
f7bf6e1083 Include Stripe js only once in the admin section 2021-11-22 21:39:20 +01:00
SarvarKhalimov
c202c52d8b Refactor correct_social_url method in enterprise model and its tests 2021-11-22 23:31:56 +05:00
Maikel
a3dd14906f Direct beginners to Rails tutorials 2021-11-22 17:56:20 +11:00
Transifex-Openfoodnetwork
ba5555a522 Updating translations for config/locales/nb.yml 2021-11-20 00:51:04 +11:00
Nihal M. Kelanthodika
8a42043701 Fixed inconsistency with display of unit name for products sold by item 2021-11-19 13:39:42 +05:30
Maikel
3b082beaab Merge pull request #8493 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.9 
Bump karma from 6.3.8 to 6.3.9
 2021-11-19 16:14:23 +11:00
Maikel Linke
f89263f060 Update translations 2021-11-19 15:43:52 +11:00