Skip to content

Commit

Permalink
Merge branch 'main' into feature/stan
Browse files Browse the repository at this point in the history
  • Loading branch information
adrolli authored Feb 7, 2025
2 parents 48e71a3 + 1101573 commit c78886f
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 5 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,15 @@
"contributions": [
"review"
]
},
{
"login": "flashadvocate",
"name": "Guybrush",
"avatar_url": "https://avatars.githubusercontent.com/u/7848492?v=4",
"profile": "https://github.com/flashadvocate",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ Moox is made by these nice people, and bots ...
<td align="center" valign="top" width="14.28%"><a href="http://www.rodrigoborges.com.br"><img src="https://avatars.githubusercontent.com/u/5695498?v=4?s=100" width="100px;" alt="Rodrigo Borges"/><br /><sub><b>Rodrigo Borges</b></sub></a><br /><a href="https://github.com/mooxphp/moox/pulls?q=is%3Apr+reviewed-by%3Arodrigoborges" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/thiago25787"><img src="https://avatars.githubusercontent.com/u/1185968?v=4?s=100" width="100px;" alt="Thiago Almeida"/><br /><sub><b>Thiago Almeida</b></sub></a><br /><a href="https://github.com/mooxphp/moox/pulls?q=is%3Apr+reviewed-by%3Athiago25787" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/marcelonogueira"><img src="https://avatars.githubusercontent.com/u/15114097?v=4?s=100" width="100px;" alt="Marcelo Nogueira"/><br /><sub><b>Marcelo Nogueira</b></sub></a><br /><a href="https://github.com/mooxphp/moox/pulls?q=is%3Apr+reviewed-by%3Amarcelonogueira" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/flashadvocate"><img src="https://avatars.githubusercontent.com/u/7848492?v=4?s=100" width="100px;" alt="Guybrush"/><br /><sub><b>Guybrush</b></sub></a><br /><a href="https://github.com/mooxphp/moox/commits?author=flashadvocate" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"larastan/larastan": "^3.0",
"laravel/pint": "^1.0",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6.6",
"nunomaduro/collision": "^8.0",
"pestphp/pest": "^3.0",
"pestphp/pest-plugin-laravel": "^3.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/builder/resources/lang/hr/translations.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<?php

return [
'single' => '',
'plural' => '',
'breadcrumb' => '',
'title' => '',
'navigation_label' => '',
'navigation_group' => '',
'totalone' => '',
'totaltwo' => '',
'totalthree' => '',
'name' => 'Ime',
'started_at' => 'Pokrenuto',
'failed' => 'neuspjelo',
Expand Down
4 changes: 3 additions & 1 deletion packages/builder/src/Generators/Entity/PluginGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public function generate(): void
];

$content = $this->replaceTemplateVariables($template, $variables);
$this->writeFile($this->context->getPath('plugin'), $content);
$path = $this->context->getPath('plugin').'/'.
$this->context->getEntityName().'Plugin.php';
$this->writeFile($path, $content);
}

protected function getResources(): string
Expand Down
13 changes: 13 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## 3.1.0

- Remove Mockery
- Remove pharaonic/laravel-readable

## 3.0.2

- Minor fixes

## 3.0.1

- Minor fixes

## 3.0.0

- New Traits and Service Structure
Expand Down
1 change: 0 additions & 1 deletion packages/core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"spatie/laravel-package-tools": "^1.13.0",
"laravel/framework": "^10.0|^11.0",
"filament/filament": "^3.2",
"pharaonic/laravel-readable": "^1.0.5",
"codeat3/blade-google-material-design-icons": "^1.0",
"ryangjchandler/filament-progress-column": "^1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/jobs/resources/lang/en/translations.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
'retry' => 'Retry',
'retry_all_failed_jobs' => 'Retry all failed Jobs',
'retry_all_failed_jobs_notification' => 'All failed jobs have been pushed back onto the queue.',
'delete_all_failed_jobs' => 'Deleted all failed Jobs',
'delete_all_failed_jobs' => 'Delete all failed Jobs',
'delete_all_failed_jobs_notification' => 'All failed jobs have been removed.',
'jobs_pushed_back_notification' => 'jobs have been pushed back onto the queue.',
'job_pushed_back_notification' => 'has been pushed back onto the queue.',
Expand Down
1 change: 0 additions & 1 deletion packages/jobs/src/Traits/FormatSeconds.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Moox\Jobs\Traits;

// TODO: replace by Laravel Readable package
trait FormatSeconds
{
public function formatSeconds(int $seconds): string
Expand Down
1 change: 1 addition & 0 deletions public/build/assets/app-D7iVuhjt.css

Large diffs are not rendered by default.

0 comments on commit c78886f

Please sign in to comment.