raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,365 Commits 18 Branches 452 Tags
bfcf1203ac78f91bcd4e70283989c7908fbd883c
Commit Graph

27365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
bfcf1203ac Delete dead code 2023-06-01 10:11:20 +01:00
Matt-Yorkley
896e4c45f2 Clarify confusing class 2023-06-01 10:11:20 +01:00
Matt-Yorkley
3e5ecba738 Remove unhelpful Helper 2023-06-01 10:11:20 +01:00
Matt-Yorkley
e5eb622ac7 Cut dead code 2023-06-01 10:11:20 +01:00
Filipe
6b98e2b3cb Merge pull request #10911 from jibees/10901-white-label-customized-logo-on-small-screens-doesnt-use-the-customized-url 
[White Label] Small width screens : use the white label link if exists for logo in nav bar
 2023-06-01 08:16:53 +01:00
Filipe
61b70a25d9 Merge pull request #10897 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-1.0.0 
chore(deps): bump mrujs from 0.10.1 to 1.0.0
 2023-06-01 08:03:32 +01:00
Filipe
e0d24ed5c0 Merge pull request #10912 from openfoodfoundation/dependabot/bundler/puma-6.3.0 
chore(deps): bump puma from 6.2.2 to 6.3.0
 2023-06-01 07:42:22 +01:00
Filipe
2d4d8e26f5 Merge pull request #10875 from jibees/10561-allow-user-to-create-custom-tab-in-shop-navigation 
[White Label] Allow user to create custom tab in shop navigation
 2023-06-01 07:21:25 +01:00
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
dependabot[bot]
1b6815515e chore(deps): bump puma from 6.2.2 to 6.3.0 
Bumps [puma](https://github.com/puma/puma) from 6.2.2 to 6.3.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.2.2...v6.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-31 10:01:43 +00:00
Jean-Baptiste Bellet
ac30e8b9da Use the white label link if exists, otherwise, use the main_app.root_path 2023-05-31 10:46:23 +02: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
Maikel Linke
77f716306d Remove redundant test 2023-05-29 10:07:34 +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
Jean-Baptiste Bellet
01b3b3b5bb Add some specs around tab for a shop 2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
6b29f7e3c5 Sanitize content with a new TrixScrubber 
specifically made for trix editor with its allowed tags
 2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
f26ecdf4f9 Don't need to pass the order through the nested view 2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
6775e0b8f1 Add custom_ prefix to avoid name collision 
One can name the custom tab `shop` which can be confusing.
 2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
9e67bd5824 Use specified values to be sure they aren't empty 2023-05-26 15:19:27 +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
dependabot[bot]
856fcd9e18 chore(deps): bump mrujs from 0.10.1 to 1.0.0 
Bumps [mrujs](https://github.com/KonnorRogers/mrujs) from 0.10.1 to 1.0.0.
- [Changelog](https://github.com/KonnorRogers/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/KonnorRogers/mrujs/compare/v0.10.1...v1.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-26 09:58:38 +00:00
Jean-Baptiste Bellet
a24604f146 Remove unused enterprise declaration 2023-05-26 10:24:11 +02: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