raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,821 Commits 19 Branches 452 Tags
5e0287d93fc29df644bf256b45cb33a1d2dd4f37
Commit Graph

25821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ijdershem-jf
5e0287d93f [9834] Fix red error highlighting on product category select label 2022-12-24 18:13:23 -07:00
ijdershem-jf
58fb2ebe29 [9834] Fix red error highlighting on product unit selection label 2022-12-24 09:44:37 -07:00
jibees
fd74473bdd Merge pull request #10199 from filipefurtad0/fixes_list_spec 
Changes dates to be dynamic using Time.zone.now
 2022-12-24 11:22:34 +01:00
filipefurtad0
78c29f2c6a Changes dates to be dynamic using Time.zone.now 
Strips leading zeroes from datepicker assertion
 2022-12-23 17:11:49 +00:00
Rachel Arnould
7a62a95e0b Merge pull request #10103 from binarygit/stop-horizontal-scroll-of-body-in-order-summary-page 
[Split Checkout] Stop horizontal scroll on body in order summary page
v4.2.27 		2022-12-23 10:29:21 +01:00
Jean-Baptiste Bellet
b8e4dcac7c Update all locales with the latest Transifex translations 2022-12-23 10:27:19 +01:00
Filipe
944d552f6b Merge pull request #10156 from ijdershem/idersh/issue-9834-pt3 
[OFN-9834-PT3] Add placeholder for new product supplier field
 2022-12-22 15:42:38 +00:00
Filipe
c3e4c53a01 Merge pull request #10074 from binarygit/order-cycle-closes-during-split-co 
Redirect to shopfront when Order cycle closes during split checkout
 2022-12-22 15:09:57 +00:00
Filipe
ae59621341 Merge pull request #10174 from ijdershem/idersh/OFN-9870 
[OFN-9870] Correct error message for differing variant_unit_name for same product in import
 2022-12-22 11:20:12 +00:00
Filipe
d61affd82b Merge pull request #10093 from vviekk/viv/noneTranslate 
Translating text 'None' for tax and shipping categories of the product
 2022-12-21 21:45:05 +00:00
jibees
c0364a845d Merge pull request #10172 from filipefurtad0/fix_flaky_invoice_spec_2 
Removes line break for displaying product units
 2022-12-21 18:37:50 +01:00
Filipe
47e100607c Merge pull request #10041 from abdellani/add_on-hand_and_on-demand_to_product_report 
Add 'on hand' and 'on demand' to Products report
 2022-12-21 17:31:21 +00:00
filipefurtad0
7f17bfaa9a Separates assertions to account for line breaks 
Rubocop corrections
 2022-12-21 17:25:30 +00:00
jibees
e9f92d39aa Merge pull request #10184 from abdellani/fix-zeitwork-load-exception 
prevent loading the reporting module if already loaded [dev environment]
 2022-12-21 11:26:19 +01:00
Mohamed ABDELLANI
23462e9965 avoid loading reporting lib if it's already loaded 2022-12-21 10:58:48 +01:00
Mohamed ABDELLANI
0d0c568b10 overwrite the default fields_to_hide to [] on OrderCycleSupplierTotals tests 2022-12-21 07:33:05 +01:00
Mohamed ABDELLANI
155b8ed725 subtract fields_to_hide when the fields_to_show are calculated 2022-12-21 07:32:18 +01:00
Mohamed ABDELLANI
11ea6b39cf test if All products report returns on_hand and on_demand 2022-12-21 07:23:32 +01:00
ijdershem-jf
18e9aba6b8 [OFN-9870] Display accurate error message for differing variant_unit_name for same product in import 2022-12-20 08:19:47 -07:00
Filipe
561458ce43 Merge pull request #9933 from Laurel16/instagram 
Admin, Enterprise Settings, Social: Add instagram handler validator
 2022-12-20 12:40:57 +00:00
Filipe
6f3d27b99b Merge pull request #10089 from abdellani/fix-payment-non-3d-need-to-be-manually-captured-in-BO 
Fix Payments with non-3D cards need to be manually captured in the BO (Split checkout)
 2022-12-20 10:09:45 +00:00
dependabot[bot]
8e5495c34d Merge pull request #10176 from openfoodfoundation/dependabot/bundler/rubocop-1.41.0 2022-12-20 09:18:06 +00:00
dependabot[bot]
59b727aa95 Bump rubocop from 1.40.0 to 1.41.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.40.0 to 1.41.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.40.0...v1.41.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-20 09:04:30 +00:00
binarygit
3b179e75a4 Stop horizontal scroll on body in cart page 2022-12-19 21:30:31 +05:45
dependabot[bot]
33896a73f3 Merge pull request #10171 from openfoodfoundation/dependabot/bundler/shoulda-matchers-5.3.0 2022-12-19 09:33:32 +00:00
dependabot[bot]
d97f49d1d4 Bump shoulda-matchers from 5.2.0 to 5.3.0 
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v5.2.0...v5.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-19 09:03:57 +00:00
dependabot[bot]
1ca305ab7c Merge pull request #10166 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.0.12 2022-12-16 10:33:18 +00:00
dependabot[bot]
ea07795304 Bump @floating-ui/dom from 1.0.10 to 1.0.12 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.0.10 to 1.0.12.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.0.12/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-16 09:01:18 +00:00
Jean-Baptiste Bellet
f8ec71d0d8 Update all locales with the latest Transifex translations v4.2.26 2022-12-16 09:34:23 +01:00
Filipe
006ad6be73 Merge pull request #9929 from abdellani/fix-available-shipping-payment-methods-dont-respect-oc-setting 
fix payment methods loading on multi-distributor order cycle checkout page
 2022-12-15 17:05:03 +00:00
Filipe
d995e7630c Merge pull request #10076 from abdellani/fix-available-shipping-methods-dont-respect-oc-setting 
Fix available shipping methods dont respect oc setting
 2022-12-15 16:52:16 +00:00
dependabot[bot]
36b3cbb300 Merge pull request #10162 from openfoodfoundation/dependabot/bundler/test-unit-3.5.7 2022-12-15 14:56:56 +00:00
dependabot[bot]
0a5eb9386c Bump test-unit from 3.5.5 to 3.5.7 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.5 to 3.5.7.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.5.5...3.5.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-15 09:04:54 +00:00
ijdershem-jf
741dc0e29c [9834-PT3] Add en translation for new product supplier select placeholder 2022-12-14 20:35:19 -07:00
Filipe
d801b6e970 Merge pull request #10102 from binarygit/enable-save-btn-after-removing-fee 
[Admin][Order Cycle] Enable save btn after removing fee
 2022-12-14 17:13:32 +00:00
Filipe
7fe7a672ae Merge pull request #9990 from abdellani/get_producer_and_product_taxt_status_in_OCSTR 
add producer and product tax category tax status to the OCSTs report
 2022-12-14 15:25:22 +00:00
Rachel Arnould
fd95970774 Merge pull request #8996 from jibees/introduce-backoffice-ui-uplift 
Introduce backoffice UI uplift
 2022-12-14 14:20:43 +01:00
dependabot[bot]
a046d0538b Merge pull request #10158 from openfoodfoundation/dependabot/bundler/rails-html-sanitizer-1.4.4 2022-12-14 08:16:38 +00:00
dependabot[bot]
9cd35ddd65 Bump rails-html-sanitizer from 1.4.3 to 1.4.4 
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-14 07:59:16 +00:00
dependabot[bot]
ac87daab4b Merge pull request #10155 from openfoodfoundation/dependabot/bundler/loofah-2.19.1 2022-12-14 07:58:33 +00:00
ijdershem-jf
ea45462e50 [9834-PT3] Add placeholder/default select option for new product supplier field 2022-12-13 18:17:49 -07:00
dependabot[bot]
bd0b251724 Bump loofah from 2.19.0 to 2.19.1 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.19.0...v2.19.1)

---
updated-dependencies:
- dependency-name: loofah
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-13 20:38:27 +00:00
Rachel Arnould
f3d82b41ad Merge pull request #10108 from binarygit/transparent-bg-in-ff 
Fix: Transparent background of 'Complete Order' area on Firefox mobile
 2022-12-13 17:34:52 +01:00
dependabot[bot]
a1d939af24 Merge pull request #10153 from openfoodfoundation/dependabot/bundler/view_component-2.79.0 2022-12-13 09:21:38 +00:00
dependabot[bot]
eeacdb676e Bump view_component from 2.78.0 to 2.79.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.78.0 to 2.79.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v2.78.0...v2.79.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-13 09:04:37 +00:00
jibees
21366f8109 Merge pull request #10127 from filipefurtad0/split_system_tests 
Splits admin and consumer system tests into two runner machines
 2022-12-12 16:14:56 +01:00
jibees
e4bfe7fac6 Merge pull request #10057 from filipefurtad0/fix_rspec_mocks_deprecation_2 
Updates syntax to remove depracation warnings
 2022-12-12 16:02:52 +01:00
Jean-Baptiste Bellet
a8278446b3 Simplify the way we render the name column 2022-12-12 15:20:30 +01:00
Jean-Baptiste Bellet
10bfe00123 Rename column "Name" 2022-12-12 15:20:30 +01:00
dependabot[bot]
e790fc2b7b Merge pull request #10140 from openfoodfoundation/dependabot/bundler/knapsack_pro-3.6.0 2022-12-12 13:52:50 +00:00