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
25,175 Commits 21 Branches 450 Tags
ec65e4dcaad0efca83064d9ef978adefb252ac31
Commit Graph

25175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurel16
ec65e4dcaa Fix: Missing translation in error messages issue#9559 
Fix: changing local translation for variant_unit in spree/product en.yml

Fix: add unite_value key to en.yml
 2022-10-17 15:32:04 +11:00
Maikel
c83eb5d5dc Merge pull request #9768 from ashwini-seshadri/admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 
Fix for: [Admin][Permissions] Granting permission to a shop displays it in "Producers" list as if it was a supplier #9589
 2022-10-17 09:58:03 +11:00
jibees
bf74612892 Merge pull request #9775 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.2 
Bump tom-select from 2.2.1 to 2.2.2
 2022-10-14 09:27:06 +02:00
jibees
eae7d96b30 Merge pull request #9774 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.2 
Bump @hotwired/turbo from 7.2.0 to 7.2.2
 2022-10-14 09:21:36 +02:00
dependabot[bot]
78b73c988e Bump tom-select from 2.2.1 to 2.2.2 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: tom-select
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-13 09:41:37 +00:00
jibees
cd641cc5d6 Merge pull request #9714 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.2.1 
Bump tom-select from 2.1.0 to 2.2.1
 2022-10-13 11:30:13 +02:00
dependabot[bot]
50555a3fe9 Bump @hotwired/turbo from 7.2.0 to 7.2.2 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.2.0 to 7.2.2.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.2.0...v7.2.2)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-13 09:08:24 +00:00
jibees
7c6e220bf7 Merge pull request #9771 from mkllnk/rspec-slow 
Add convencience script to test flaky specs
 2022-10-13 10:44:00 +02:00
Maikel Linke
3496b57942 Add convencience script to test flaky specs 2022-10-13 16:28:09 +11:00
Maikel Linke
bc805d94d8 Update translations v4.2.17 2022-10-13 16:03:26 +11:00
Ashwini Seshadri
1596649034 Merge branch 'master' into admin_permissions_granting_permission_to_a_shop_displays_it_in_producers_list_as_if_it_was_a_supplier 2022-10-13 06:48:40 +02:00
Maikel
d33cdd1327 Merge pull request #9706 from jibees/9625-create-a-component-to-display-hide-columns-for-report 
Create a component to display/hide columns for report
 2022-10-13 10:05:27 +11:00
jibees
daaff2f7e8 Merge pull request #9764 from mkllnk/simple-oc-spec 
Stabilise spec by waiting for JS requests
 2022-10-12 10:17:51 +02:00
Jean-Baptiste Bellet
4de0b9ad11 Avoid warning on compilation 2022-10-12 09:28:50 +02:00
Jean-Baptiste Bellet
14a258c661 Attempt: externalize ofn-drop-down-v2 selector 
+ add class `redesigned-checkbox` on `input`

Move `input.redesigned-input` definition outside dropdown definition

--> more generic
 2022-10-12 09:28:50 +02:00
jibees
3b3f9a7513 Merge pull request #9766 from openfoodfoundation/dependabot/npm_and_yarn/babel/preset-env-7.19.4 
Bump @babel/preset-env from 7.19.3 to 7.19.4
 2022-10-12 09:07:53 +02:00
Maikel
3e1b66fd01 Remove extra blank line from Gemfile 2022-10-12 17:15:12 +11:00
Maikel Linke
9da6f862cd Stabilise pending spec 2022-10-12 16:49:29 +11:00
Maikel Linke
3eb597bff4 Fix specs which accidentally reversed relationships 2022-10-12 16:49:29 +11:00
Maikel Linke
46fde6bd40 Remove now unused scope 2022-10-12 16:48:32 +11:00
Ashwini Seshadri
590a09f069 Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list 
and updated relevant tests
 2022-10-12 16:48:31 +11:00
Maikel
1d9fbbf69e Merge pull request #9767 from jibees/fix-flaky-spec 
BOM Specs, don't need to wait for UI feedback: only check on page content
 2022-10-12 11:52:50 +11:00
Maikel
b378d7655f Merge pull request #9762 from openfoodfoundation/dependabot/bundler/view_component-2.74.1 
Bump view_component from 2.74.0 to 2.74.1
 2022-10-12 11:24:11 +11:00
Rachel Arnould
617a417dc2 Merge pull request #9506 from binarygit/remove-angular-from-payment-methods 
Remove angular from payment methods
 2022-10-11 13:13:26 +02:00
Jean-Baptiste Bellet
bfbdb5f44b Don't need to wait for UI feedback: only check on page content 
ie. table content
 2022-10-11 12:16:25 +02:00
dependabot[bot]
ae84dfe3cd Bump @babel/preset-env from 7.19.3 to 7.19.4 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.19.3 to 7.19.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-11 09:03:45 +00:00
Jean-Baptiste Bellet
8a6874326a selected could be nil if no columns are selected 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
68de510c4e Redesign checkboxes 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
230afd5024 Update multiple_checked_select_component.html.haml 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
41e696282c Don't build inputs, but directly use input checkbox for each option 
way simpler this way.
 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
e655d5b188 Remove useless id attribute. Prefer to use data-value directly. 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
7d15baef9d Do not use a variable filter_placeholder but translate it in the view 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
312f2544dd Be sure that option key is a Symbol (it could be a String) 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
157bdd9f3d Add a vertical scrolling 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b4e041c7e9 Implements the ofn-drop-down-v2 design 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
23e2d28488 Implements the filter options feature 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
0f9ebfe34a Use the MultipleCheckedSelectComponent 2022-10-11 10:05:06 +02:00
Jean-Baptiste Bellet
b7adc5f551 Create the MultipleCheckedComponent 
+ Associate the StimulusController to this component
 2022-10-11 10:05:06 +02:00
dependabot[bot]
7b0ce3272a Bump view_component from 2.74.0 to 2.74.1 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.74.0 to 2.74.1.
- [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.74.0...v2.74.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-11 04:19:01 +00:00
Maikel Linke
5bbbe4b67a Stabilise spec by waiting for JS requests 
Well, two seconds is just a guess. Ideally the page wouldn't display
until we have everything loaded. But this logic will be replaced when we
chuck out AngularJS.

This version passed over 100 runs with a busy CPU on my machine.
 2022-10-11 14:57:59 +11:00
Maikel
4705d306b5 Merge pull request #9730 from AthiraKadampatta/9726-unused-paperclip-columns-ignored-list 
Ignore paperclip columns to prepare for deletion
 2022-10-11 11:44:42 +11:00
Maikel
2082404c87 Merge pull request #9752 from maniSHarma7575/9603-fix-order-cycle-fees-dropdown 
Fixed same enterprise appear several times in the fee dropdown list
 2022-10-11 09:41:02 +11:00
Maikel
c9a7230fe2 Merge pull request #9635 from mkllnk/stable-specs 
Remove retries from test runs
 2022-10-11 09:36:50 +11:00
Jean-Baptiste Bellet
1f329e85bc Also include plugins 2022-10-10 17:15:46 +02:00
AthiraKadampatta
b2c778794d 9726 Remove safe navigation operator and simplify call to attachment file name 2022-10-10 16:52:02 +02:00
AthiraKadampatta
80eef9c302 9726 Add attachment_width and attachment_height to the list of ignored columns for spree images 2022-10-10 16:52:02 +02:00
AthiraKadampatta
f40b569a4a 9726 Use active storage filename instead of attachment_file_name of paperclip 2022-10-10 16:52:02 +02:00
AthiraKadampatta
1f161bee1f Add paperclip columns to ignored columns list for enterprise, enterprise group, terms_of_service_file, spree/image models 2022-10-10 16:52:02 +02:00
Jean-Baptiste Bellet
4140e3d153 Import tom-select file directly 
can't use "tom-select" anymore, due to a mis-configuration with babel I guess
 2022-10-10 16:10:33 +02:00
Jean-Baptiste Bellet
db70c47a31 Specify IE 11 as a target 
Comes from error using tom-select:

```
ERROR in ./node_modules/tom-select/dist/esm/tom-select.js
Module build failed (from ./node_modules/babel-loader/lib/index.js):
Error: /Users/jibees/dev/openfoodnetwork/node_modules/tom-select/dist/esm/tom-select.js: unknown Statement of type "ForOfStatement"
```
 2022-10-10 16:09:43 +02:00