raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-18 04:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,402 Commits 15 Branches 457 Tags
e2695fdbfb7f3ef6c4b063653b06c4b49a39803a
Commit Graph

23402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
e2695fdbfb Merge pull request #8829 from mkllnk/8824-patch-aws-sdk 
Fix image uploads by patching aws-sdk
 2022-02-03 12:44:13 +00:00
Maikel Linke
2e6d8c1216 Provide aws-sdk with working URI.encode method 
The S3 class is calling URI.encode which is removed in Ruby 3. By
providing a URI module within the S3 class makes the S3 code call that
module instead.
 2022-02-03 15:20:51 +11:00
Maikel Linke
6468b7d98d Spec image upload 
The use of AWS S3 was untested before and it failed after upgrading to
Ruby 3.
 2022-02-03 11:25:16 +11:00
Filipe
787b643832 Merge pull request #8818 from jibees/8793-specify-a-min-width-for-radio-input 
Split checkout: specify a min width for radio input that improve the rendering on iOS
 2022-02-02 18:31:27 +00:00
Maikel
433227cc09 Merge pull request #8820 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.13 
Bump karma from 6.3.12 to 6.3.13
 2022-02-02 14:46:46 +11:00
Filipe
ca0166a420 Merge pull request #8807 from Matt-Yorkley/closed-oc-payment-auth 
Fix Stripe payment authorizing for closed order cycles
 2022-02-01 11:16:31 +00:00
Filipe
998f7afdc4 Merge pull request #8523 from seballot/progress-for-ajax-request 
Improve loading spinner display
 2022-02-01 10:03:04 +00:00
Filipe
012527522c Merge pull request #8640 from jibees/8630-make-buttons-sticky 
Make split checkout buttons sticky on step 3
 2022-02-01 09:41:33 +00:00
dependabot[bot]
bbf10a7198 Bump karma from 6.3.12 to 6.3.13 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.12 to 6.3.13.
- [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.12...v6.3.13)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-01 09:04:04 +00:00
Maikel
b995c3ed49 Merge pull request #8815 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.17 
Bump @storybook/addon-controls from 6.4.14 to 6.4.17
 2022-02-01 19:02:34 +11:00
dependabot[bot]
031258e1ee Bump @storybook/addon-controls from 6.4.14 to 6.4.17 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.14 to 6.4.17.
- [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.17/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-02-01 06:06:09 +00:00
Maikel
e060a059d8 Merge pull request #8817 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.17 
Bump @storybook/addon-docs from 6.4.14 to 6.4.17
 2022-02-01 17:05:42 +11:00
dependabot[bot]
f02c79751c Bump @storybook/addon-docs from 6.4.14 to 6.4.17 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.14 to 6.4.17.
- [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.17/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-02-01 05:40:34 +00:00
Maikel
2938de7eee Merge pull request #8816 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.17 
Bump @storybook/server from 6.4.14 to 6.4.17
 2022-02-01 16:39:47 +11:00
Filipe
8d18279f53 Merge pull request #8784 from apricot12/7398-Weight_field-on-non-weight-variants 
Convert variant.weight into decimal if integer or 0.0 if nil
 2022-01-31 18:55:31 +00:00
Filipe
4e4d9bb5a5 Merge pull request #8804 from Matt-Yorkley/split-checkout-fees 
[Split Checkout] Ensure fees are applied during checkout update
 2022-01-31 16:26:22 +00:00
Matt-Yorkley
5b434ca7c4 Replace conditional with a guard clause 2022-01-31 15:55:35 +00:00
Matt-Yorkley
11ed1574ca Call #check_order_cycle_expiry in PaypalController and StripeController, but avoid it on #authorize action 
The authorize action is used for authorizing off-session payments where the order is *already complete* and the order cycle may have closed (backoffice and subscriptions). They are essentially asynchronous and not coupled to the current open/closed state of the order cycle.
 2022-01-31 15:55:35 +00:00
Matt-Yorkley
5e6dd1e6e1 Move #check_order_cycle_expiry method to OrderStockCheck and don't call it from BaseController :before_action callback 2022-01-31 15:55:35 +00:00
Jean-Baptiste Bellet
d97381548a Specify a min width for radio 2022-01-31 15:50:37 +01:00
Nihal M. Kelanthodika
ddaac654ef Add specs for conversion of variant weight input into decimal/0.0 2022-01-31 17:43:15 +05:30
Jean-Baptiste Bellet
da6be441f8 Make sticky buttons fullwidth on mobile 2022-01-31 11:47:35 +01:00
Jean-Baptiste Bellet
ae0a71b29d This row adds an extra space on the right of the page 
which introduce an horizontal scroll: visual regression
 2022-01-31 11:47:21 +01:00
Filipe
6dac65ace5 Merge pull request #8803 from Matt-Yorkley/buttons-regression 
Fix visual regression on filter buttons
v4.1.15 		2022-01-31 10:32:57 +00:00
Jean-Baptiste Bellet
fdeadd0940 Reduce margin on step3 since the container could be a little too high 2022-01-31 11:31:32 +01:00
Jean-Baptiste Bellet
d8391aa1d3 Create a div with a special class (checkout-step3) 
... and attach the controller to it

Add the T&Cs inside the sicked container with submit buttons
 2022-01-31 11:31:32 +01:00
Jean-Baptiste Bellet
293bc10dde Create a sticky controller that handle the sticky position of an element 
.. at the bottom
And then add the sticked class to this element if the element is actually sticked
 2022-01-31 11:31:32 +01:00
Jean-Baptiste Bellet
3abef1b703 Specify css for this sticky container 
with a nice box-shadow.
Handle special case for mobile view (ie. max width 700px)
 2022-01-31 11:31:32 +01:00
dependabot[bot]
091c04427c Bump @storybook/server from 6.4.14 to 6.4.17 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.14 to 6.4.17.
- [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.17/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-01-31 09:04:40 +00:00
Matt-Yorkley
f5bde96701 Merge pull request #8812 from Matt-Yorkley/temp-translation 
Disable test which depends on missing Transifex keys
 2022-01-29 20:09:22 +00:00
Matt-Yorkley
f4fdc8740e Disable test that depends on missing Transifex keys 2022-01-29 20:06:46 +00:00
Filipe
e63225d389 Merge pull request #8727 from Matt-Yorkley/js-matomo-login 
Move Matomo event tracking for login modal into Authentication service
 2022-01-28 20:02:46 +00:00
Matt-Yorkley
6c6e5ca316 Ensure fees are applied during checkout 2022-01-28 11:38:23 +00:00
Matt-Yorkley
4ace7efd97 Fix visual regression on filter buttons 2022-01-28 10:40:01 +00:00
Matt-Yorkley
8c33dc16e8 Update all locales with the latest Transifex translations 2022-01-27 18:24:01 +00:00
Matt-Yorkley
b588ab78b7 Merge pull request #8777 from openfoodfoundation/transifex 
Transifex
 2022-01-27 18:17:06 +00:00
Matt-Yorkley
73259d4fb7 Merge pull request #8797 from Matt-Yorkley/digest 
Add digest gem explicitly
 2022-01-27 18:09:14 +00:00
Matt-Yorkley
a535acc256 Add digest gem explicitly 
This was previously part of the standard lib in Ruby, but is being transitioned to an external gem. Fixes console warning:

"warning: already initialized constant Digest::REQUIRE_MUTEX"
 2022-01-27 15:51:27 +00:00
Filipe
49030049dd Merge pull request #8732 from Matt-Yorkley/template-cull 
Remove some Angular templates
 2022-01-27 15:18:06 +00:00
Transifex-Openfoodnetwork
2eed23d14b Updating translations for config/locales/fr.yml 2022-01-28 00:24:38 +11:00
Transifex-Openfoodnetwork
2e3bc758e3 Updating translations for config/locales/en_FR.yml 2022-01-28 00:24:36 +11:00
Matt-Yorkley
0bec693655 Merge pull request #8791 from Matt-Yorkley/split-checkout-terms 
[Split Checkout] Update terms of service handling
 2022-01-27 13:07:04 +00:00
Nihal M. Kelanthodika
23a7ba2479 Added before_save callback to convert variant weight to decimal and 0.0 if nil 2022-01-27 16:33:14 +05:30
Matt-Yorkley
312e6c3326 Merge pull request #8796 from Matt-Yorkley/drop-embedded-shops 
Remove embedded shopfronts code
 2022-01-27 10:05:51 +00:00
Transifex-Openfoodnetwork
9a46eaffba Updating translations for config/locales/en_FR.yml 2022-01-27 19:18:10 +11:00
Transifex-Openfoodnetwork
135b629134 Updating translations for config/locales/fr.yml 2022-01-27 19:17:46 +11:00
Matt-Yorkley
1ee3d0f7a1 Drop embedded shops code 2022-01-26 19:58:39 +00:00
Filipe
75395f6f29 Merge pull request #8648 from Matt-Yorkley/csp 
Configure CSP
 2022-01-26 19:55:11 +00:00
Filipe
28a126024f Merge pull request #8722 from cillian/remove-unused-js-from-products-form 
Remove unused inline JavaScript from products/_form.html.haml
 2022-01-26 19:14:24 +00:00
Filipe
374c05116b Merge pull request #8726 from Matt-Yorkley/stringex-machina 
Reduce impact of stringex gem
 2022-01-26 19:02:41 +00:00