raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-16 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,439 Commits 15 Branches 457 Tags
457d5a6c830dae25714be6b3ff56839efd9fda0a
Commit Graph

27439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
457d5a6c83 Override some css classes, to have a beautiful trix editor toolbar buttons 
- buttons background are transparent (instead of blue)
 - buttons background on hovering are transparent (instead of green)
 - disabled buttons cursor is default (instead of pointer)
 2023-06-08 11:43:59 +02:00
jibees
c6b5eda85c Merge pull request #10951 from openfoodfoundation/dependabot/bundler/faraday-2.7.6 
chore(deps): bump faraday from 2.7.5 to 2.7.6
 2023-06-07 17:34:10 +02:00
dependabot[bot]
24343c769e chore(deps): bump faraday from 2.7.5 to 2.7.6 
Bumps [faraday](https://github.com/lostisland/faraday) from 2.7.5 to 2.7.6.
- [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.5...v2.7.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-07 09:57:34 +00:00
Filipe
2d28a57c6f Merge pull request #10922 from jibees/10903-white-label-make-logo-url-link-more-tolerant-in-terms-of-format-and-add-example 
[White Label] Make logo url link more tolerant in terms of format
 2023-06-07 10:00:31 +01:00
Maikel
1c9a09d88d Merge pull request #10943 from openfoodfoundation/dependabot/bundler/paranoia-2.6.2 
chore(deps): bump paranoia from 2.6.1 to 2.6.2
 2023-06-07 16:31:01 +10:00
Maikel Linke
1ebacf96ad Ignore accidental spaces around whitelabel URL 2023-06-07 13:12:06 +10:00
Konrad
1b6147db30 Merge pull request #10896 from jibees/10571-bom-orders-not-sorted-by-most-recent-date 
BOM: Sort by order completed at desc for line items by default
 2023-06-06 17:37:54 +02:00
dependabot[bot]
10ca09eaef chore(deps): bump paranoia from 2.6.1 to 2.6.2 
Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.6.1 to 2.6.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases)
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md)
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.6.1...v2.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-06 10:00:41 +00:00
Jean-Baptiste Bellet
40111910b6 Validates white_label_logo_link on enterprise model 2023-06-05 11:24:07 +02:00
Jean-Baptiste Bellet
4edb159ef8 Avoid flaky spec by matching the array 
Context: https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/5081492387/jobs/9129944001?pr=10896
 2023-06-05 10:05:09 +02:00
Jean-Baptiste Bellet
ccb183d60b Sort by order_date desc for line_items in BOM 
+ update spec to have different order time
 2023-06-05 10:05:09 +02:00
jibees
a785b4d5e0 Merge pull request #10928 from openfoodfoundation/dependabot/bundler/rubocop-1.52.0 
chore(deps-dev): bump rubocop from 1.51.0 to 1.52.0
 2023-06-05 09:28:04 +02:00
Maikel Linke
16fba20686 Update rubocop todo file 2023-06-05 12:13:35 +10:00
Maikel Linke
1cbb45a618 Style Lint/RedundantSafeNavigation 
The cop suggested to change more but they were false positives:

* https://github.com/rubocop/rubocop/pull/11915
 2023-06-05 12:09:32 +10:00
Maikel Linke
38bd31d0e3 Style Layout/TrailingWhitespace 2023-06-05 10:42:21 +10:00
Konrad
750b6b284d Merge pull request #10910 from jibees/10902-white-label-for-uploading-custom-logo-use-same-design-as-for-enterprise-logobanner-and-provide-required-image-dimensions 
[White Label] Backoffice: improve design for logo used in shopfront
 2023-06-04 14:50:49 +02:00
dependabot[bot]
78338864d8 chore(deps-dev): bump rubocop from 1.51.0 to 1.52.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.51.0 to 1.52.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.51.0...v1.52.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-02 09:57:30 +00:00
filipefurtad0
840da55941 Update all locales with the latest Transifex translations v4.3.11 2023-06-02 09:17:23 +01:00
Jean-Baptiste Bellet
880ba85791 Add http to white label logo link if this do not start with http 2023-06-01 17:37:05 +02:00
Jean-Baptiste Bellet
ced8f8aa58 Use shared_examples as we will test many URLs later on 
"It's a Surprise Tool That Will Help Us Later"
 2023-06-01 17:37:05 +02:00
jibees
d63c47e0f1 Merge pull request #10920 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-5.0.3 
chore(deps): bump sidekiq-scheduler from 5.0.2 to 5.0.3
 2023-06-01 17:26:54 +02:00
jibees
fd7d68d0a8 Merge pull request #10919 from openfoodfoundation/dependabot/bundler/rspec-rails-6.0.3 
chore(deps-dev): bump rspec-rails from 6.0.2 to 6.0.3
 2023-06-01 17:25:58 +02:00
Jean-Baptiste Bellet
2e0191e603 Improve UX: same as enterprise logo and promo image 2023-06-01 17:16:22 +02:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Filipe
2ba0f635f2 Merge pull request #10860 from Matt-Yorkley/order-cycle-deleting 
Delete exchange variants in bulk when deleting an order cycle
 2023-06-01 13:49:32 +01:00
Filipe
d67227deb8 Merge pull request #10812 from Matt-Yorkley/options-values 
Remove OptionValue and OptionType code
 2023-06-01 13:49:16 +01:00
Matt-Yorkley
1128fd9c02 Visual tweak to ship/capture buttons and success feedback 2023-06-01 12:13:12 +01:00
dependabot[bot]
3e46115f79 chore(deps): bump sidekiq-scheduler from 5.0.2 to 5.0.3 
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v5.0.2...v5.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-01 10:00:31 +00:00
dependabot[bot]
e428944849 chore(deps-dev): bump rspec-rails from 6.0.2 to 6.0.3 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v6.0.2...v6.0.3)

---
updated-dependencies:
- dependency-name: rspec-rails
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-01 09:59:07 +00:00
Matt-Yorkley
e99c328643 Update app/services/variant_units/variant_and_line_item_naming.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-01 10:12:19 +01:00
Matt-Yorkley
0ac10472cf Update app/models/spree/line_item.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-06-01 10:12:19 +01:00
Matt-Yorkley
7f5d1be792 Guard against unsaved variant's product in OptionValueNamer for product import 2023-06-01 10:12:19 +01:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Matt-Yorkley
35b41fc7fe Persist unit_value on variant and "option value text" on variant and line_item and improve related AR callbacks 2023-06-01 10:12:19 +01:00
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