raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,945 Commits 18 Branches 452 Tags
de29d7e7d78a96efd15993b22ffacb338ea86f41
Commit Graph

21945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Brett
de29d7e7d7 Merge pull request #8125 from jibees/5782-add-i18n-for-devise 
Add devise-i18n and handle i18nization for devise controllers
 2021-09-08 11:48:12 -07:00
Andy Brett
26e973828f Merge pull request #8151 from Matt-Yorkley/codecov-tasks 
Remove Codecov upload tasks
 2021-09-08 11:11:43 -07:00
Matt-Yorkley
48d4341e2d Merge pull request #8112 from cillian/eager-load-permissions-with-enterprise-relationships 
Eager load the EnterpriseRelationship :permissions association on the enterprise permissions page
 2021-09-08 19:46:14 +02:00
Matt-Yorkley
2b95ede1a2 Merge pull request #8115 from pacodelaluna/update-docker-configuration 
Update Docker configuration to support sidekiq and webpacker
 2021-09-08 12:06:08 +02:00
Matt-Yorkley
ef02197bab Remove Codecov upload tasks 2021-09-08 10:48:28 +01:00
Andy Brett
3ef427aa7d Merge pull request #8076 from jibees/8009-handling-shipping-adress 
Split Checkout: Handle shipping address
 2021-09-07 11:15:52 -07:00
Matt-Yorkley
b4278aabbf Merge branch 'master' into 8009-handling-shipping-adress 2021-09-07 09:44:49 +02:00
jibees
a16430d10c Merge pull request #6 from Matt-Yorkley/8009-handling-shipping-adress 
8009-handling-shipping-adress: REDUX
 2021-09-07 09:03:22 +02:00
Andy Brett
ee546ffdd6 Merge pull request #8146 from Matt-Yorkley/dev-log-level 
Make log_level more easily configurable in development
 2021-09-06 18:05:39 -07:00
Matt-Yorkley
3bcfc673f7 Ensure selected shipping method is actually selected 
Hashes with symbol keys != hashes with string keys 🙈
 2021-09-06 20:58:22 +01:00
Matt-Yorkley
78e28c517b Make log_level more easily configurable in development 2021-09-06 19:13:00 +01:00
Matt-Yorkley
fb7a3a681b Validate attributes per checkout step and decouple order-advancing 2021-09-06 14:25:16 +01:00
Matt-Yorkley
71412f8d4b Update validations 2021-09-06 14:22:28 +01:00
Matt-Yorkley
c3b52ef00a Remove payments validation 2021-09-06 14:19:35 +01:00
Matt-Yorkley
cfee804339 Improve concern loading 
It shouldn't need `require` or `prepend`
 2021-09-06 14:19:13 +01:00
Matt-Yorkley
e3e53b1504 Ensure feature toggle works for non-logged-in users 2021-09-05 22:39:47 +01:00
Matt-Yorkley
70513ae989 Don't transition to address before page load 2021-09-05 20:19:22 +01:00
Andy Brett
3e0509d232 Merge pull request #8141 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.8 
Bump @storybook/addon-controls from 6.3.7 to 6.3.8
 2021-09-04 12:16:46 -07:00
dependabot[bot]
ed2f555d84 Bump @storybook/addon-controls from 6.3.7 to 6.3.8 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.7 to 6.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.3.8/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.8/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>
 2021-09-04 18:07:53 +00:00
Andy Brett
c0eb71f67f Merge pull request #8138 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.8 
Bump @storybook/addon-docs from 6.3.7 to 6.3.8
 2021-09-04 11:03:22 -07:00
dependabot[bot]
585f5a4cfa Bump @storybook/addon-docs from 6.3.7 to 6.3.8 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.7 to 6.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.3.8/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.8/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-09-04 17:22:07 +00:00
Andy Brett
8b00807a20 Merge pull request #8110 from openfoodfoundation/dependabot/bundler/bootsnap-1.8.1 
Bump bootsnap from 1.7.7 to 1.8.1
 2021-09-04 10:13:23 -07:00
Andy Brett
7600838490 Merge pull request #8116 from openfoodfoundation/dependabot/bundler/paper_trail-12.1.0 
Bump paper_trail from 12.0.0 to 12.1.0
 2021-09-04 10:11:23 -07:00
Andy Brett
4cddd031aa Merge pull request #8137 from openfoodfoundation/dependabot/bundler/test-unit-3.4.5 
Bump test-unit from 3.4.4 to 3.4.5
 2021-09-04 10:10:19 -07:00
Andy Brett
a9e53272c6 Merge pull request #8139 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.1.0 
Bump jest from 27.0.6 to 27.1.0
 2021-09-04 10:10:02 -07:00
Andy Brett
85f893c7ed Merge pull request #8140 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.8 
Bump @storybook/server from 6.3.7 to 6.3.8
 2021-09-04 10:09:37 -07:00
dependabot[bot]
c9a631df2a Bump @storybook/server from 6.3.7 to 6.3.8 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.7 to 6.3.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.3.8/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.8/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>
 2021-09-04 10:23:28 +00:00
dependabot[bot]
d47a089bfb Bump jest from 27.0.6 to 27.1.0 
Bumps [jest](https://github.com/facebook/jest) from 27.0.6 to 27.1.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.0.6...v27.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 10:22:06 +00:00
dependabot[bot]
dbafbd6391 Bump test-unit from 3.4.4 to 3.4.5 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.4.4 to 3.4.5.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.4.4...3.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-04 10:13:33 +00:00
Andy Brett
75f827aee9 Merge pull request #8120 from openfoodfoundation/dependabot/bundler/test-prof-1.0.7 
Bump test-prof from 1.0.6 to 1.0.7
 2021-09-03 17:35:32 -07:00
Andy Brett
b2f8d978c6 Merge pull request #8107 from openfoodfoundation/dependabot/bundler/rubocop-1.20.0 
Bump rubocop from 1.19.1 to 1.20.0
 2021-09-03 12:05:28 -07:00
Matt-Yorkley
54987dd622 Merge pull request #8099 from jibees/8097-test-stimulus 
Add jest and stimulusjs testing
 2021-09-03 16:16:16 +02:00
Jean-Baptiste Bellet
ec4d5bd9a2 Remove babel warning 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
149c0d4de4 Add yarn jest to the github workflow 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
7cdf09322c First test for toggle_controller 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
310c3c4005 Define each file to be tested by jest 2021-09-03 14:14:25 +02:00
Jean-Baptiste Bellet
195464361d Install needed dependencies 2021-09-03 14:14:25 +02:00
Matt-Yorkley
86da71d6c0 Update all locales with the latest Transifex translations v4.1.0 2021-09-03 10:33:33 +01:00
Matt-Yorkley
fe99a5cc55 Merge pull request #8129 from Matt-Yorkley/searchable 
Searchable attributes
 2021-09-03 09:43:25 +02:00
Matt-Yorkley
72d494c640 Merge pull request #8127 from Matt-Yorkley/session-uri-parsing 
Strip subdomains from session cookie host
 2021-09-03 09:38:11 +02:00
Matt-Yorkley
fbdc38b6c4 Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column- 
Display variant quantity on the quantity column on the edit order page in backoffice
 2021-09-02 20:45:22 +02:00
Matt-Yorkley
0459071ce3 Set RAILS_ENV=test in test suite 2021-09-02 17:29:26 +01:00
Matt-Yorkley
dc8939c35f Strip subdomains from session cookie host 2021-09-02 17:29:26 +01:00
Matt-Yorkley
3fc0278776 Whitelist searchable attributes on primary models 2021-09-02 14:06:15 +01:00
Matt-Yorkley
b25759670e Implement ransackable whitelisting 2021-09-02 13:43:22 +01:00
Jean-Baptiste Bellet
97fd7e3d78 Improve look and feel by adding some responsive margins 2021-09-01 17:16:30 +02:00
Jean-Baptiste Bellet
1b7c36664e Add missing i18n key for Devise 
and update tests as well:
 - from feature to system
 - Add the reset password scenario
 - Add some errors scenario to the reset password scenario: token expired, token invalid, and not the same password
 2021-09-01 17:16:29 +02:00
Matt-Yorkley
fd8de65749 Merge pull request #8123 from openfoodfoundation/dependabot/bundler/view_component-2.39.0 
Bump view_component from 2.38.0 to 2.39.0
 2021-09-01 16:52:05 +02:00
Matt-Yorkley
cab470bd86 Merge pull request #8122 from openfoodfoundation/dependabot/npm_and_yarn/tar-6.1.11 
Bump tar from 6.1.5 to 6.1.11
 2021-09-01 16:51:00 +02:00
Matt-Yorkley
9d6e5e9420 Remove currently unused code 2021-09-01 15:04:53 +01:00