Skip to content

Commit acb7b87

Browse files
MEP - merge develop into main (#281)
2 parents d127552 + 11dddee commit acb7b87

File tree

22 files changed

+68
-588
lines changed

22 files changed

+68
-588
lines changed

Diff for: app/Livewire/Pages/Discussions/Index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function tagExists(string $tag): bool
5757
public function render(): View
5858
{
5959
/** @var DiscussionQueryBuilder $query */
60-
$query = Discussion::with('tags') // @phpstan-ignore-line
60+
$query = Discussion::with(['tags', 'replies', 'user']) // @phpstan-ignore-line
6161
->withCount('replies')
6262
->forLocale($this->locale)
6363
->notPinned();

Diff for: app/Livewire/Pages/Forum/Index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ protected function applyUnAnswer(Builder $query): Builder
139139

140140
public function render(): View
141141
{
142-
$query = Thread::with('channels')
142+
$query = Thread::with(['channels', 'user'])
143143
->orderByDesc('created_at');
144144

145145
$query = $this->applyChannel($query);

Diff for: resources/js/app.js

-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@ import intersect from '@alpinejs/intersect'
55
import Tooltip from '@ryangjchandler/alpine-tooltip'
66
import collapse from '@alpinejs/collapse'
77

8-
import './elements'
9-
import { registerHeader } from './utils/header'
108
import './utils/helpers'
119
import './utils/scrollspy'
1210
import './utils/clipboard'
1311

14-
registerHeader()
15-
1612
Alpine.plugin(intersect)
1713
Alpine.plugin(Tooltip)
1814
Alpine.plugin(collapse)

Diff for: resources/js/components/datepicker.js

-130
This file was deleted.

Diff for: resources/js/components/internationalNumber.js

-26
This file was deleted.

Diff for: resources/js/elements/TimeAgo.js

-102
This file was deleted.

Diff for: resources/js/elements/TimeCountdown.js

-47
This file was deleted.

Diff for: resources/js/elements/index.js

-5
This file was deleted.

0 commit comments

Comments
 (0)