Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 8774bd8
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Thu Jan 19 08:41:01 2023 +0000

    Update composer version (#817)

commit 519f070
Author: Aslam <aslam.hafidz@meteor.id>
Date:   Thu Jan 12 20:17:15 2023 +0700

    [0.1] Hotfix - Remove collection (#783)

    * Hotfix - Remove collection

    * pint

commit 0f445c9
Author: Maurice Ellis <maurice@328studios.co>
Date:   Thu Jan 12 04:49:33 2023 -0700

    Hotfix - Properly handle adding media when disk is not local (#701)

    * Properly handle adding media when disk is not local

    In order to obtain the media from a remote location, addMediaFromDisk has to be used. addMedia only works when the file is stored on the server. You can set a default media disk for Spatie Media Library, so I used that config and then determined if it was local or not, so the image can be found and added properly.

    * Added storage facade

    * Pint fixes

    * Pint

    * Updated variables to camelcase

    * Update HasImages.php

    Co-authored-by: Alec Ritson <hello@itsalec.co.uk>

commit 19ae84d
Author: Ruben van Erk <github@accounts.rubenvanerk.nl>
Date:   Wed Jan 11 08:25:16 2023 +0100

    Check language code unique when updating (#786)

    * Add unique rule for code when updating a language

    * Convert unique language code rule to string

commit be0aca5
Author: Alec Ritson <hello@itsalec.co.uk>
Date:   Fri Dec 2 10:53:40 2022 +0000

    Release - 0.1.5 (#765)

    * Update CHANGELOG.md

    * Changelog and assets
  • Loading branch information
alecritson committed Jan 19, 2023
1 parent fada0b5 commit 10ce12d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"laravel/scout": "^9.4",
"livewire/livewire": "^2.0",
"lukascivil/treewalker": "0.9.1",
"lunarphp/licensing": "dev-main",
"lunarphp/licensing": "^0.1",
"lunarphp/livewire-tables": "self.version",
"php": "^8.0",
"spatie/laravel-activitylog": "^4.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"lunarphp/livewire-tables": "self.version",
"lunarphp/core": "self.version",
"livewire/livewire": "^2.0",
"lunarphp/licensing": "dev-main",
"lunarphp/licensing": "^0.1",
"barryvdh/laravel-dompdf": "^2.0"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class="space-y-2">
</div>

<button class="px-2 py-1 text-xs text-red-700 border border-red-200 rounded shadow-sm hover:bg-red-50"
wire:click.prevent="removeProduct('{{ $collection->id }}')">
wire:click.prevent="removeCollection('{{ $collection->id }}')">
{{ __('adminhub::global.deselect') }}
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ public function removeCollection($id)
{
$index = collect($this->selected)->search($id);
unset($this->selected[$index]);
$this->selected = collect($this->selected)->values();
}

/**
Expand Down

0 comments on commit 10ce12d

Please sign in to comment.