raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,334 Commits 19 Branches 453 Tags
add725b6c0be984cbbe991ff0faeb20e5d375d02
Commit Graph

27334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
add725b6c0 Merge pull request #10861 from mkllnk/dfc-import 
Update products with DFC Prototype
 2023-06-01 08:48:39 +10:00
Filipe
5f429c77f8 Merge pull request #10791 from dacook/10630-new-brand-colours 
[admin_v3] New brand colours in admin interface
 2023-05-31 16:03:18 +01:00
Filipe
668a573f12 Merge pull request #10908 from filipefurtad0/flaky_simple_spec 
Changes date through keystrokes; removes Retry option
 2023-05-30 16:43:36 +01:00
filipefurtad0
c5358b1303 Changes date through keystrokes; removes Retry option 2023-05-30 10:02:44 +01:00
jibees
7b6077d01f Merge pull request #10905 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.2.9 
chore(deps): bump @floating-ui/dom from 1.2.8 to 1.2.9
 2023-05-29 14:57:34 +02:00
dependabot[bot]
841a021bc4 chore(deps): bump @floating-ui/dom from 1.2.8 to 1.2.9 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.2.8 to 1.2.9.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.2.9/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-05-29 09:59:12 +00:00
jibees
7ea2aa699d Merge pull request #10904 from mkllnk/update-job-spec 
Simplify background report spec after rspec fix
 2023-05-29 10:19:31 +02:00
Maikel Linke
3fa62ceccf Simplify background report spec after rspec fix 
The rspec-rails gem had an issue which was fixed in the last release.
Now we can remove my workaround and simplify the spec.
 2023-05-29 13:25:44 +10:00
David Cook
24c407f920 Merge pull request #10898 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.1 
chore(deps): bump sidekiq from 7.1.0 to 7.1.1
 2023-05-29 13:09:15 +10:00
Konrad
fff02a7ddb Merge pull request #10893 from jibees/10853-white-label-remove-ofn-logo-on-navigation-menu-for-small-width-screens 
[White Label] Small width screens: Hide OFN logo and use the customized logo if activated
 2023-05-28 12:00:49 +02:00
Maikel Linke
0dcd87dda9 Update stock and SKU from DFC 
The input has been observed with the nginx access log including
$request_body when the DFC Protoype pushed an update.
 2023-05-28 10:39:08 +02:00
Maikel Linke
375b3a3cb0 Update variant's quantity from DFC 2023-05-28 10:39:08 +02:00
Maikel Linke
48a52582e6 Update variant description with DFC description 
We used the name before because the DFC Prototype only displays the
description.
 2023-05-28 10:39:08 +02:00
Maikel Linke
63837381e0 Update DFC test data with observation 
This request came from the current DFC prototype. The changes are
probably implementing DFC v1.7.

I observed by including `$request_body` in the nginx log on the staging
server.
 2023-05-28 10:39:08 +02:00
Maikel Linke
50ef06c973 Name DFC test data to clarify content 
The DFC has several products like PhysicalProduct and SuppliedProduct.
Here we have a supplied product.
 2023-05-28 10:39:08 +02:00
Maikel Linke
7344eb678b Remove now unused helper 
It was only used in controller specs which were all converted to request
specs.
 2023-05-28 10:39:08 +02:00
Maikel Linke
dde4ea9334 Convert CatalogItems controller spec to request spec 2023-05-28 10:39:08 +02:00
Maikel Linke
207a15e55c Convert SuppliedProducts controller spec to request spec 2023-05-28 10:39:08 +02:00
Maikel Linke
742468efd2 Convert EnterpriseController spec to request spec 
Also testing request of unrelated enterprise instead of non-existing
enterprise because authorisation is important to test.
 2023-05-28 10:39:08 +02:00
Maikel Linke
d338c61d2c Convert PersonsController spec request spec 
It's much more realistic and also tests the routing and authentication.
Besides using real authentication I also improved the matchers.
 2023-05-28 10:39:08 +02:00
Maikel Linke
67c29dd38f Activate DFC provider engine, remove feature toggle 2023-05-28 10:39:08 +02:00
dependabot[bot]
2f1e3a5c96 chore(deps): bump sidekiq from 7.1.0 to 7.1.1 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.0 to 7.1.1.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.0...v7.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-26 10:01:59 +00:00
David Cook
14345ef1fa Change warning orange to Mojo 
> That way we only have one orangy/red colour and we start simplifying things.
 2023-05-26 15:11:23 +10:00
David Cook
0df7c45a61 Change warning red to Mojo 
Some templates still had this colour hardcoded. They are using angular so I didn't spend time updating them.
 2023-05-26 15:11:23 +10:00
David Cook
dcf857cafb Move warning colour definition to CSS 
This also changes the orange to red, but that's part of the plan.
 2023-05-26 15:11:23 +10:00
David Cook
e674c53535 Change error red color to Mojo 
color-5 is used for error messages.
 2023-05-26 15:11:23 +10:00
David Cook
719a704985 Change blue colour as per design 
https://github.com/openfoodfoundation/openfoodnetwork/issues/10630#issue-1644928392
 2023-05-26 15:11:23 +10:00
David Cook
60ec24b92b Use variables for spree-blue 
Aka 'Havelock Blue', which is going to be changing.
 2023-05-26 15:11:23 +10:00
David Cook
e928e74ae6 Use different palette for admin styles v3 
Note that mail.css is still referring to the old palette.
 2023-05-26 15:10:49 +10:00
David Cook
31fa9c2c04 Add admin_style_v3 feature toggle 2023-05-26 15:10:27 +10:00
David Cook
01b3901b08 Add admin_style_v3 
Individual files may be copied in order to replace the old files.

NOTE: these may need manually re-syncing. If any of the copied files have changed on master in the meantime, we'll need to manaully review to consider bringing those changes to the new design.
 2023-05-26 15:10:27 +10:00
David Cook
9051318147 Move colour palette to new file 
This seemed like a good separation which will probably help with the upcoming changes.

Co-authored-by: jibees <jb.bellet@gmail.com>
 2023-05-26 15:09:59 +10:00
Maikel
b013d3f2d4 Merge pull request #10895 from jibees/10894-flaky-speccontrollersapiv0order_cycles_controller_specrb89 
Fix flaky spec: Prefer using `match_array` over `eq` to compare array
 2023-05-26 14:06:14 +10:00
David Cook
875f68b0e2 Update one more translation v4.3.10 2023-05-26 11:46:22 +10:00
Jean-Baptiste Bellet
cf9342f2c4 Prefer using match_array over eq to compare array 
As we don't need order: https://rubydoc.info/github/rspec/rspec-expectations/RSpec%2FMatchers:match_array
 2023-05-25 15:24:25 +02:00
Jean-Baptiste Bellet
eea1db4c4a Hide OFN logo and use the customized logo if activated 2023-05-25 15:17:04 +02:00
jibees
8dde81c498 Merge pull request #10891 from openfoodfoundation/dependabot/bundler/test-unit-3.5.9 
chore(deps): bump test-unit from 3.5.8 to 3.5.9
 2023-05-25 13:34:38 +02:00
dependabot[bot]
2084d84c7a chore(deps): bump test-unit from 3.5.8 to 3.5.9 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.8 to 3.5.9.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.5.8...3.5.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-25 09:58:28 +00:00
Filipe
8b7ca292af Merge pull request #10884 from openfoodfoundation/10882-cookie-banner-is-displayed-on-every-page-even-after-accepting 
Do not show cookies banner once user accept it
 2023-05-25 10:36:27 +01:00
David Cook
f890d9ceb4 Update all locales with the latest Transifex translations 2023-05-25 17:12:10 +10:00
jibees
abc0a29ddb Merge pull request #10889 from mkllnk/dead-code 
Remove dead reference to removed model
 2023-05-25 09:10:14 +02:00
Maikel Linke
86c35fe2dc Remove dead reference to removed model 2023-05-25 16:13:33 +10:00
Filipe
6d032002f1 Merge pull request #10750 from jibees/10560-allow-hide-of-groups-tab-in-shop-navigation 
White Label: allow hide of groups tab in shop navigation
 2023-05-24 21:11:04 +01:00
filipefurtad0
ca107c036c Enables caching for cookies_spec.rb 2023-05-24 19:46:28 +02:00
jibees
e60376e6bd Merge pull request #10885 from openfoodfoundation/dependabot/bundler/faraday-2.7.5 
chore(deps): bump faraday from 2.7.4 to 2.7.5
 2023-05-24 15:18:10 +02:00
jibees
d704157fef Merge pull request #10886 from openfoodfoundation/dependabot/bundler/knapsack_pro-4.1.0 
chore(deps-dev): bump knapsack_pro from 4.0.0 to 4.1.0
 2023-05-24 15:17:16 +02:00
dependabot[bot]
b985ab8d99 chore(deps-dev): bump knapsack_pro from 4.0.0 to 4.1.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 4.0.0 to 4.1.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v4.0.0...v4.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 10:10:08 +00:00
dependabot[bot]
d60ba96fe9 chore(deps): bump faraday from 2.7.4 to 2.7.5 
Bumps [faraday](https://github.com/lostisland/faraday) from 2.7.4 to 2.7.5.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.7.4...v2.7.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 10:08:17 +00:00
Jean-Baptiste Bellet
3cd53cbd41 Adds some keys to this cached element, due to cookie banner 
Once the user accept the cookie, we should not show the cookie banner element. This is handled via `app/helpers/footer_links_helper.rb#cookies_policy_link` and boolean:

```
!Web::CookiesConsent.new(cookies, request.host).exists? && Spree::Config.cookies_consent_banner_toggle
```
 2023-05-24 10:45:06 +02:00
Maikel
32d425dd58 Merge pull request #10880 from openfoodfoundation/dependabot/bundler/knapsack_pro-4.0.0 
Bump knapsack_pro from 3.11.0 to 4.0.0
 2023-05-24 14:05:09 +10:00