raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,016 Commits 18 Branches 454 Tags
07ac381a97ccdd8667eca650a5bbdc55187d032b
Commit Graph

29016 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
07ac381a97 Ignore block length of response blocks 
In Rswag request specs, the `response` block is like `describe` and is
just used to group several other blocks. It can be long and that's okay.
 2023-09-21 09:19:21 +10:00
Maikel Linke
02f251c900 Import DFC SuppliedProduct as new variant of existing product 2023-09-21 09:04:57 +10:00
Maikel Linke
db5b6e5406 Enable DFC importer to import OFN objects 2023-09-21 09:04:28 +10:00
Maikel Linke
fcf7b94278 Add our own SuppliedProduct with custom property 2023-09-21 09:02:20 +10:00
Maikel Linke
c42f62e09f Add custom OFN product id to DFC SuppliedProduct 
The Spree::Variant in OFN corresponds to a DFC SuppliedProduct. But
several Spree::Variant can be grouped under one Spree::Product which
wasn't exposed on the DFC API.

I'm adding a custom property here which can be used internally and
shouldn't break any other DFC tools.

A gotcha of this first test implementation:

The `ofn:` prefix has not been defined in the context. Software needs
to know that this is an Open Food Network attribute or ignore it.
We could define our own context and ontology and publish it on our
website but I don't see any benefit of that at this point.
 2023-09-21 08:54:32 +10:00
Maikel Linke
2175c59a6b Load spec helper not knowing Rails 
When the application is not preloaded then running Rspec doesn't know
Rails until the spec helper is loaded. So we can't use Rails to find the
path of the spec helper. This has been fixed before but the DFC Address
code was developed at the same time and missed.
 2023-09-21 08:54:32 +10:00
Maikel
458767fe13 Merge pull request #11569 from macanudo527/fix_stylehash_6 
Fix Style/HashSyntax 7/13
 2023-09-21 08:35:39 +10:00
Rachel Arnould
15137caed2 Merge pull request #11509 from dacook/buu-editing-part3-11059 
[BUU] Bulk form editing features
 2023-09-20 19:27:05 +02:00
Neal Chambers
bad1f55cdd Update .rubocop_todo.yml 2023-09-20 23:47:52 +09:00
Neal Chambers
29df80945d Fix Style/HashSyntax 2023-09-20 23:46:26 +09:00
Maikel
d216b68993 Merge pull request #11562 from macanudo527/fix_stylehash_5 
Fix Style/HashSyntax 6/13
 2023-09-20 12:00:30 +10:00
jibees
964373ce2b Merge pull request #11566 from openfoodfoundation/dependabot/bundler/valid_email2-5.0.3 
chore(deps): bump valid_email2 from 5.0.2 to 5.0.3
 2023-09-19 16:25:46 +02:00
jibees
34d605111a Merge pull request #11567 from openfoodfoundation/dependabot/bundler/ffaker-2.23.0 
chore(deps): bump ffaker from 2.22.0 to 2.23.0
 2023-09-19 16:25:01 +02:00
dependabot[bot]
f9aa4a9d67 chore(deps): bump ffaker from 2.22.0 to 2.23.0 
Bumps [ffaker](https://github.com/ffaker/ffaker) from 2.22.0 to 2.23.0.
- [Release notes](https://github.com/ffaker/ffaker/releases)
- [Changelog](https://github.com/ffaker/ffaker/blob/main/Changelog.md)
- [Commits](https://github.com/ffaker/ffaker/compare/v2.22.0...v2.23.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-19 09:56:46 +00:00
dependabot[bot]
5eeb45ed25 chore(deps): bump valid_email2 from 5.0.2 to 5.0.3 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.0.2 to 5.0.3.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.0.2...v5.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-19 09:46:32 +00:00
David Cook
759705efcf Add spec for onKeyup 2023-09-19 14:48:39 +10:00
David Cook
6bfdd1bc12 Split spec into multiple examples 2023-09-19 14:48:34 +10:00
David Cook
693d5bad4a Merge pull request #11551 from mkllnk/setup-node-version 
Install the current node version in setup
 2023-09-19 13:49:43 +10:00
David Cook
0af497ab23 Merge pull request #11539 from filipefurtad0/improve_tests_around_bulk_invoice_printing 
[Release test automation] Adds assertions on bulk invoice creation
 2023-09-19 13:49:19 +10:00
Neal Chambers
d1b8edaa94 Update .rubocop_todo.yml 2023-09-19 08:26:15 +09:00
Neal Chambers
42a6a02353 Fix Style/HashSyntax 2023-09-19 08:25:56 +09:00
filipefurtad0
6a31849fb4 Asserts on url from View File link 2023-09-18 10:43:13 +01:00
Gaetan Craig-Riou
c6e9a84633 Merge pull request #11557 from openfoodfoundation/dependabot/bundler/valid_email2-5.0.2 
chore(deps): bump valid_email2 from 5.0.0 to 5.0.2
 2023-09-18 19:29:08 +10:00
Rachel Arnould
00b7ae9600 Merge pull request #11496 from jibees/buu-css/ui-tweaks-on-legacy-backoffice-to-be-consitent-and-usable 
🚧  BUU: update and tweak UI and CSS to fit V3 style to legacy
 2023-09-18 10:53:28 +02:00
filipefurtad0
06ca2979dd Adds assertions on bulk invoice creation 2023-09-18 09:29:44 +01:00
Maikel
2c3561d47f Merge pull request #11554 from macanudo527/fix_stylehash_4 
Fix Style/HashSyntax 5/13
 2023-09-18 15:34:06 +10:00
Maikel
a1e3bae9b6 Merge pull request #11550 from openfoodfoundation/dependabot/bundler/stripe-9.3.0 
chore(deps): bump stripe from 9.2.0 to 9.3.0
 2023-09-18 15:31:42 +10:00
dependabot[bot]
6cf46c9bdc chore(deps): bump valid_email2 from 5.0.0 to 5.0.2 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 5.0.0 to 5.0.2.
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v5.0.0...v5.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-18 04:21:35 +00:00
Maikel
e2783cda05 Merge pull request #11549 from openfoodfoundation/dependabot/bundler/view_component-3.6.0 
chore(deps): bump view_component from 3.5.0 to 3.6.0
 2023-09-18 14:14:35 +10:00
Neal Chambers
4beacfb970 Update .rubocop_todo.yml 2023-09-16 09:07:22 +09:00
Neal Chambers
4596997547 Fix Style/HashSyntax 2023-09-16 09:05:31 +09:00
jibees
0b4d0a1438 Merge pull request #11552 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.5.3 
chore(deps): bump @floating-ui/dom from 1.5.2 to 1.5.3
 2023-09-15 11:28:38 +02:00
dependabot[bot]
727afbc115 chore(deps): bump @floating-ui/dom from 1.5.2 to 1.5.3 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.5.2 to 1.5.3.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.5.3/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>
 2023-09-15 09:14:48 +00:00
Jean-Baptiste Bellet
02bbd9a9ba Adjust colors and height for sidebar-item component 2023-09-15 11:05:59 +02:00
Jean-Baptiste Bellet
657f4d95d7 move sidebar-item into admin v3 context 2023-09-15 11:02:45 +02:00
Jean-Baptiste Bellet
fe81900639 Update select2.scss 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
10b6df6bd7 Tweak dashboard for a hub manager 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
7326241c70 Move pages/changetypeform to admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
ae04063643 Create and adjust big button 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
4aaf0ddc18 Move dashboard-single-ent into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
a59c8adbbf Adjust color for edit action to $teal 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
241dbd1ded move plugins/powertip into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
62465b9bbc Move components/actions into admin_v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
dfe79396f6 Use $teal color for some info in the order page 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
f71ace1d39 Move sections/orders scss file into admin v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
f110c55531 Add product_import into admin_v3 context and adjust some colors 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
8ae68b15a0 Adjust select2 multiple choices colors 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
beba709827 Move buttons/input stuff into related file 
And adjust design for v3 style
 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
371e064f82 Adjust padding left right size for text-angular component in v3 context 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
6a771ad09c Move text-angular component rules to admin_style_v3 context 2023-09-15 10:47:44 +02:00