Gaetan Craig-Riou fb2575aaeb Fix more rebase issue

2024-07-03 11:23:02 +10:00

..

assets/javascripts

Fix producer property filtering

2024-07-03 11:21:28 +10:00

channels

Switch to tighter Channel scoping...

2023-06-09 14:44:53 +10:00

components

Merge pull request #12546 from dacook/buu/change-columns-11055

2024-06-19 09:25:47 +10:00

constraints

Simplify negated feature toggle constraint

2023-01-11 10:10:30 +00:00

controllers

Order cycle API, separate properties and producer_properties

2024-07-03 11:21:28 +10:00

forms

Put Subscriptions back into Schedules Controller

2023-08-24 09:18:35 +09:00

helpers

Update button should change status on modified white label

2024-06-17 17:11:19 +02:00

jobs

Merge pull request #12619 from rioug/12559-disable-report-button

2024-06-28 17:11:29 +02:00

json_schemas

Fix Style/HashSyntax

2023-09-12 23:19:05 +09:00

mailers

Fix producer mailer

2024-07-03 11:21:28 +10:00

models

Ignore supplier_id for Spree::Product

2024-07-03 11:23:02 +10:00

queries

Fix product scope query

2024-07-03 10:17:49 +10:00

reflexes

Fix search by producer, BUU product page

2024-07-03 10:17:49 +10:00

serializers

Remove supplier_id from simple product serializer

2024-07-03 11:21:28 +10:00

services

Fix Ruboxop issue

2024-07-03 11:21:28 +10:00

validators

…

views

Fix more rebase issue

2024-07-03 11:23:02 +10:00

webpacker

Merge branch 'master' into task/11987-remove-SR-from-clone

2024-06-26 16:18:42 +05:00