raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-05 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,713 Commits 20 Branches 455 Tags
77085cf9bb033ed9fb8e933c5b2eba1e24655ab1
Commit Graph

22713 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
77085cf9bb Merge pull request #8587 from filipefurtad0/checkout_stripe_into_system 
Updates/moves checkout_stripe into system
 2021-12-08 18:12:49 +11:00
Maikel
9307b97f5b Merge pull request #8586 from filipefurtad0/checkout_paypal_into_system 
Updates/moves checkout_paypal into system
 2021-12-08 18:11:45 +11:00
Maikel
81fff677ac Merge pull request #8584 from filipefurtad0/shop_cart_spec_into_system 
Updates/moves cart_spec into system
 2021-12-08 18:10:34 +11:00
Maikel
2dd80a8c6b Merge pull request #8583 from filipefurtad0/shopping_caching_into_system 
Updates/moves shops_caching into system
 2021-12-08 18:09:23 +11:00
Maikel
1957ae185b Merge pull request #8582 from filipefurtad0/darkswarm_into_system 
Updates/moves darkswarm_caching into system
 2021-12-08 18:07:49 +11:00
Maikel
086b469a1a Merge pull request #8575 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.8 
Bump @storybook/server from 6.3.12 to 6.4.8
 2021-12-08 18:06:57 +11:00
Maikel
65e5291679 Merge pull request #8569 from Matt-Yorkley/dead-code-backordered 
Remove dead code: Order#backordered?
 2021-12-08 18:05:38 +11:00
Maikel
d34478f271 Merge pull request #8448 from filipefurtad0/reports_spec_into_system 
Moves/updates reports_spec.rb into system
 2021-12-08 18:03:48 +11:00
dependabot[bot]
4bbdaf07ea Bump @storybook/server from 6.3.12 to 6.4.8 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.12 to 6.4.8.
- [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.8/app/server)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 05:10:04 +00:00
Maikel
d2c0c3ff7b Merge pull request #8573 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.8 
Bump @storybook/addon-docs from 6.4.3 to 6.4.8
 2021-12-08 16:07:43 +11:00
filipefurtad0
7dd002cb4d Updates/moves checkout_stripe into system 2021-12-07 16:01:56 +00:00
filipefurtad0
4fbc7eeb44 Updates/moves checkout_paypal into system 2021-12-07 13:46:40 +00:00
Matt-Yorkley
53d01b1275 Update all locales with the latest Transifex translations v4.1.10 2021-12-07 13:30:07 +00:00
Matt-Yorkley
775475f88a Merge pull request #8566 from openfoodfoundation/transifex 
Transifex
 2021-12-07 13:26:25 +00:00
Matt-Yorkley
0197831246 Merge pull request #8585 from openfoodfoundation/revert-8500-8495-Variant-unit-name-shopfront 
Revert "Fixed inconsistency with display of unit name for products sold by item"
 2021-12-07 13:24:38 +00:00
Matt-Yorkley
290e292dea Revert "Fixed inconsistency with display of unit name for products sold by item" 2021-12-07 13:24:12 +00:00
filipefurtad0
bceecc533e Updates/moves cart_spec into system 2021-12-07 11:21:27 +00:00
filipefurtad0
fb87ef29a6 Updates/moves shops_caching into system 2021-12-07 11:09:17 +00:00
filipefurtad0
37d4a21521 Updates/moves darkswarm_caching into system 2021-12-07 10:45:38 +00:00
Filipe
2233c7ae0f Merge pull request #8571 from mkllnk/fix-flaky-product-import 
Avoid flaky race conditions in product import spec
 2021-12-07 10:32:00 +00:00
Maikel Linke
5793ddfe1b Give product import spec more time 
It seems to be really slow.
 2021-12-07 17:06:45 +11:00
Transifex-Openfoodnetwork
fa2b14e31b Updating translations for config/locales/en_GB.yml 2021-12-06 21:03:46 +11:00
filipefurtad0
1bd04f283f Fixes rubocop update validation errors 2021-12-06 09:14:21 +00:00
dependabot[bot]
201d663d10 Bump @storybook/addon-docs from 6.4.3 to 6.4.8 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.3 to 6.4.8.
- [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.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-12-06 09:07:29 +00:00
Maikel Linke
d99feeaaa5 Remove unreliable spec expectation 
We were not failing if these percentages were not displayed. But the
spec did fail when the import was finished already and the progress bar
wasn't there any more.

Let's avoid these race conditions and wait for the final completion
page.
 2021-12-06 18:06:16 +11:00
Maikel Linke
dc7dfcacba Wait for product import to finish in spec 
The expectation returned to early.
 2021-12-06 18:01:17 +11:00
Matt-Yorkley
87fe341b5b Remove dead code: Order#backordered? 2021-12-05 15:17:27 +00: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
filipefurtad0
1393b52d98 Corrects several Rubocop offenses 2021-12-05 11:04:01 +00:00
Transifex-Openfoodnetwork
59380ef547 Updating translations for config/locales/it.yml 2021-12-04 04:00:36 +11:00
filipefurtad0
b246cbad06 Deletes trailing space 2021-12-03 11:07:01 +00:00
filipefurtad0
8d20174a0f Deletes doubled unused pick_date method 2021-12-03 11:06:04 +00:00
filipefurtad0
e0006a6dc4 Removes build line related to feature specs 2021-12-03 10:54:28 +00:00
filipefurtad0
7487e7256a Implements pick_date and pick_datetime helpers 2021-12-03 10:54:28 +00:00
filipefurtad0
05de253ad7 Adds pick_date and pick_datetime helpers 2021-12-03 10:54:28 +00:00
filipefurtad0
61aa357a39 Makes timedate selection independent of current date 2021-12-03 10:54:28 +00:00
filipefurtad0
2096b3474e Fixes date selection on xero-flapickr 2021-12-03 10:54:28 +00:00
filipefurtad0
87365a939a Fixes case on xero_invoice_header class 2021-12-03 10:54:28 +00:00
filipefurtad0
d2dddb674e Fixes date selection on flapickr 2021-12-03 10:54:28 +00:00
filipefurtad0
5245d5574f Fixes string case in assertions 2021-12-03 10:54:28 +00:00
filipefurtad0
a7a1673e2e Moves/updates reports_spec.rb into system 2021-12-03 10:54:28 +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