raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,382 Commits 21 Branches 450 Tags
2c596fb2ddfc63d34efec57557ab59856ca06bee
Commit Graph

22382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GeorgeThoppil
2c596fb2dd Adding regex op on long_description 2021-10-23 14:45:49 -04:00
jibees
eae134f3b6 Merge pull request #8330 from openfoodfoundation/dependabot/bundler/stripe-5.39.0 
Bump stripe from 5.38.0 to 5.39.0
 2021-10-22 09:19:26 +02:00
jibees
fa7c64841f Merge pull request #8286 from mkllnk/permalink-check 
Avoid superfluous permalink check on site load
 2021-10-22 09:14:41 +02:00
jibees
a5a45539c3 Merge pull request #8308 from mariodz95/8250_fix_snail_when_editing_non_numeric_characters_on_enterprise_fees 
Fix snail when editing non numeric characters on enterprise fees
 2021-10-22 09:14:28 +02:00
jibees
e123353252 Merge pull request #8325 from achauve/3976-improve-error-handling-of-unsupported-image-formats 
Improve error handling of unsupported image formats
 2021-10-22 09:13:19 +02:00
jibees
2e846ce1e0 Merge pull request #8347 from achauve/8227-fix-opening-product-description-links-in-new-tabs 
Fix: product edition doesn't break description links
 2021-10-22 09:13:02 +02:00
Maikel Linke
19aae9bca0 Update translations 2021-10-22 17:55:46 +11:00
Maikel
9053d3e832 Merge pull request #8309 from openfoodfoundation/transifex 
Transifex
 2021-10-22 17:51:49 +11:00
jibees
741966b569 Merge pull request #8375 from jibees/8358-add-tax-category-to-line-item 
Add `tax_category_id` for a line_item
 2021-10-21 15:00:29 +02:00
jibees
16a07d2bb2 Merge pull request #8384 from filipefurtad0/fix_flaky_checkout_spec 
Adds context to helper to assure actions are successful
 2021-10-21 09:13:56 +02:00
jibees
d4452cea39 Merge pull request #8383 from openfoodfoundation/dependabot/bundler/selenium-webdriver-4.0.2 
Bump selenium-webdriver from 3.142.7 to 4.0.2
 2021-10-21 09:11:56 +02:00
filipefurtad0
c94b5d1598 Toggles shipping info section 2021-10-20 18:58:06 +01:00
filipefurtad0
21449ea711 Adds respective sections to assure elements are found 2021-10-20 15:37:45 +01:00
dependabot[bot]
ccec7fd00b Bump selenium-webdriver from 3.142.7 to 4.0.2 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.7 to 4.0.2.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

---
updated-dependencies:
- dependency-name: selenium-webdriver
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-20 09:02:45 +00:00
Filipe
29c2f2e5e9 Merge pull request #8381 from jibees/8328-fix-flaky-on-checkout_spec 
(try to) fix flaky for spec/system/consumer/shopping/checkout_spec.rb
 2021-10-20 09:23:49 +01:00
jibees
c7658b4a78 Merge pull request #8380 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.3.1 
Bump jest from 27.3.0 to 27.3.1
 2021-10-20 09:56:13 +02:00
jibees
d3889ee948 Merge pull request #8370 from openfoodfoundation/dependabot/bundler/dalli-3.0.2 
Bump dalli from 2.7.11 to 3.0.2
 2021-10-20 09:55:19 +02:00
Jean-Baptiste Bellet
d13d1209be Prefer find and click and wait for title to appears 2021-10-20 09:32:30 +02:00
jibees
8852fe1a49 Merge pull request #8340 from filipefurtad0/enterprises_into_system 
Enterprises into system
 2021-10-20 09:17:14 +02:00
Transifex-Openfoodnetwork
04a286d3c7 Updating translations for config/locales/en_FR.yml 2021-10-20 15:32:13 +11:00
Transifex-Openfoodnetwork
3b4bd8e5ec Updating translations for config/locales/fr.yml 2021-10-20 15:31:56 +11:00
Maikel
c642b98067 Merge pull request #8193 from jibees/8155-split-checkout-mobile-views 
Some responsive modifications for split checkout
 2021-10-20 11:48:57 +11:00
dependabot[bot]
23c7ac6508 Bump stripe from 5.38.0 to 5.39.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.38.0 to 5.39.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.38.0...v5.39.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-20 00:46:20 +00:00
Maikel
3bfd53b92c Merge pull request #8377 from openfoodfoundation/dependabot/bundler/pagy-5.0.1 
Bump pagy from 4.11.0 to 5.0.1
 2021-10-20 11:45:08 +11:00
filipefurtad0
c7eed5ae57 Adds the system helper to business_address 2021-10-19 15:44:26 +01:00
filipefurtad0
33f374d177 Defines strings for warning accepting with let 2021-10-19 15:38:07 +01:00
filipefurtad0
6639ce416a Squashes terms_and_conditions_spec edits 
Moves terms_and_conditions_spec into system

Updates terms_and_conditions_spec into system
 2021-10-19 15:34:26 +01:00
filipefurtad0
9ab335302e Moves/updates index_spec into system 2021-10-19 15:34:26 +01:00
filipefurtad0
f62749e3bf Wraps alert text in images_spec 2021-10-19 15:34:26 +01:00
filipefurtad0
9579783543 Moves/updates images_spec into system 2021-10-19 15:34:26 +01:00
filipefurtad0
1ed5f2c248 Moves/updates business_address_form_spec into system 2021-10-19 15:34:26 +01:00
jibees
6deb5ea4d4 Merge pull request #8331 from openfoodfoundation/dependabot/bundler/geocoder-1.7.0 
Bump geocoder from 1.6.7 to 1.7.0
 2021-10-19 16:22:40 +02:00
dependabot[bot]
da816a4569 Bump jest from 27.3.0 to 27.3.1 
Bumps [jest](https://github.com/facebook/jest) from 27.3.0 to 27.3.1.
- [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.0...v27.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-19 14:16:46 +00:00
dependabot[bot]
a84298d4bd Bump dalli from 2.7.11 to 3.0.2 
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.11 to 3.0.2.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.11...v3.0.2)

---
updated-dependencies:
- dependency-name: dalli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-19 14:15:33 +00:00
jibees
2ceb23fdcf Merge pull request #8369 from openfoodfoundation/dependabot/bundler/redis-4.5.1 
Bump redis from 4.4.0 to 4.5.1
 2021-10-19 16:15:09 +02:00
jibees
76bf359f26 Merge pull request #8376 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.12.4 
Bump rubocop-rails from 2.12.3 to 2.12.4
 2021-10-19 14:34:10 +02:00
jibees
2b3078040d Merge pull request #8359 from filipefurtad0/fix_flaky_checkout_auth_spec 
Switches to css to select accordion element
 2021-10-19 14:20:14 +02:00
dependabot[bot]
a52b3a516b Bump rubocop-rails from 2.12.3 to 2.12.4 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.12.3 to 2.12.4.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.3...v2.12.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-19 12:12:35 +00:00
filipefurtad0
2db64a5b9f Deletes unused helper methods 2021-10-19 11:26:00 +01:00
filipefurtad0
5888d868b7 Switches to css to select accordion element 2021-10-19 11:26:00 +01:00
Filipe
c525c59c1d Merge pull request #8373 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.9 
Bump mrujs from 0.5.5 to 0.5.9
 2021-10-19 11:22:59 +01:00
jibees
0bd9018d92 Merge pull request #8348 from openfoodfoundation/dependabot/bundler/json-2.6.0 
Bump json from 2.5.1 to 2.6.0
 2021-10-19 10:46:14 +02:00
mariodz95
578efa945e Fix snail when editing enterprise fees 2021-10-19 10:26:44 +02:00
Maikel
c55e1c03f8 Merge pull request #8354 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.12 
Bump @storybook/addon-controls from 6.3.10 to 6.3.12
 2021-10-19 15:22:48 +11:00
Maikel Linke
7c73495b07 Update Pagy config for version 5 
Some variables were renamed.
 2021-10-19 15:12:35 +11:00
Maikel
a271a66998 Merge pull request #8271 from sinansonmez/8176-preselect-supplier-when-only-one 
When creating a product, preselect the supplier if there is only one
 2021-10-19 14:12:00 +11:00
Maikel
0ffe73cf56 Merge pull request #8253 from mkllnk/spec-matrix 
Simplify GH Actions config with matrix syntax
 2021-10-19 09:53:11 +11:00
Maikel Linke
61333a958e Continue all jobs when one failed 
It's nice to see the whole result to then work on all failures,
especially when there are flaky specs.
 2021-10-19 09:15:51 +11:00
Maikel Linke
9ccb744ef3 Remove superfluous env parameter 
It's already defined globally.
 2021-10-19 09:15:51 +11:00
Maikel Linke
a4db3b675d DRY actions config with matrix syntax 
This uses the matrix syntax for all rspec calls. It is easier to
maintain than the previous list of GH Actions workflows.

The execution of the rspec rake task is still in its own job because it
doesn't fit in the same pattern. The JS tests are also executed in that
job.
 2021-10-19 09:15:51 +11:00