Skip to content

Commit

Permalink
Merge branch '3.x' into timeline-styleing
Browse files Browse the repository at this point in the history
  • Loading branch information
atmonshi committed Jan 31, 2024
2 parents 77163d9 + fae28b2 commit 1a443bb
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 3 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to `zeus` will be documented in this file

## v3.1.1 - 2024-01-09

### What's Changed

* add hera by @atmonshi in https://github.com/lara-zeus/core/pull/84

**Full Changelog**: https://github.com/lara-zeus/core/compare/v3.1.0...v3.1.1

## v3.1.0 - 2024-01-08

### What's Changed
Expand Down Expand Up @@ -284,6 +292,7 @@ php artisan vendor:publish --tag=zeus-assets






```
Expand Down Expand Up @@ -316,6 +325,7 @@ php artisan vendor:publish --tag=zeus-views






```
Expand Down
2 changes: 1 addition & 1 deletion resources/dist/filament-tail.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/lara-zeus.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/dist/plugin.js": "/dist/plugin.js?id=d8eae76b5e99023184aa18c28e75a3e1",
"/dist/frontend.css": "/dist/frontend.css?id=c6603b2a6e4e34d76c0b86beee49a689",
"/dist/filament-tail.css": "/dist/filament-tail.css?id=6eeb747c14ed958539e727046a80d4b4"
"/dist/filament-tail.css": "/dist/filament-tail.css?id=8e233e598929a75526f2db0882a08ff0"
}
1 change: 1 addition & 0 deletions src/CoreServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public function packageBooted(): void
'core',
'popover',
'accordion',
'hera',
])
->filter(fn (string $package): bool => InstalledVersions::isInstalled("lara-zeus/{$package}"))
->mapWithKeys(fn ($package) => [$package => InstalledVersions::getPrettyVersion("lara-zeus/{$package}")])
Expand Down
2 changes: 2 additions & 0 deletions tailwind-filament.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ module.exports = {
'../thunder/resources/views/**/*.blade.php',
'../thunder/src/Models/TicketsStatus.php',
'../thunder/vendor/jaocero/activity-timeline/resources/views/**/*.blade.php',
// hera
'../hera/resources/views/**/*.blade.php',
],
theme: {
extend: {
Expand Down

0 comments on commit 1a443bb

Please sign in to comment.