Merge pull request #1372 from openclassify/3.10

3.10
This commit is contained in:
Fatih Alp 2024-06-29 23:11:46 +03:00 committed by GitHub
commit 30c33011cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 18 deletions

View File

@ -12,6 +12,11 @@
{ {
"name": "Visiosoft, Inc.", "name": "Visiosoft, Inc.",
"email": "support@visiosoft.com.tr" "email": "support@visiosoft.com.tr"
},
{
"name": "Vedat Akdogan",
"email": "vedatakdogan@live.com",
"role": "Developer"
} }
], ],
"require": { "require": {
@ -21,7 +26,9 @@
"anomaly/default_page_handler-extension": "2.2.x-dev", "anomaly/default_page_handler-extension": "2.2.x-dev",
"anomaly/user_security_check-extension": "2.2.x-dev", "anomaly/user_security_check-extension": "2.2.x-dev",
"anomaly/xml_feed_widget-extension": "2.2.x-dev", "anomaly/xml_feed_widget-extension": "2.2.x-dev",
"anomaly/private_storage_adapter-extension": "~1.1.0",
"anomaly/private_storage_adapter-extension": "1.2.x-dev",
"anomaly/url_link_type-extension": "2.2.x-dev", "anomaly/url_link_type-extension": "2.2.x-dev",
"anomaly/relationship-field_type": "2.3.x-dev", "anomaly/relationship-field_type": "2.3.x-dev",
"anomaly/colorpicker-field_type": "2.4.x-dev", "anomaly/colorpicker-field_type": "2.4.x-dev",
@ -89,7 +96,7 @@
"visiosoft/defaultadmin-theme": "^1.0", "visiosoft/defaultadmin-theme": "^1.0",
"visiosoft/cats-module": "^1.0", "visiosoft/cats-module": "^1.0",
"visiosoft/base-theme": "^1.0", "visiosoft/base-theme": "^1.0",
"visiosoft/advs-module": "^1.0", "visiosoft/advs-module": "v1.10.x-dev",
"visiosoft/json-field_type": "^1.0", "visiosoft/json-field_type": "^1.0",
"visiosoft/language_switcher-plugin": "^1.0", "visiosoft/language_switcher-plugin": "^1.0",
"visiosoft/global_helper-extension": "*", "visiosoft/global_helper-extension": "*",

View File

@ -260,18 +260,5 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class, 'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class, 'View' => Illuminate\Support\Facades\View::class,
/**
* Todo
* 30.11.2022
* It has been added for the use of 'with' in the PyroCMS Users Model file.
* Translate(trans) function does not accept nested arrays.
*/
// 'Anomaly\UsersModule\User\Notification\ActivateYourAccount' => \App\Notification\ActivateYourAccount::class,
// 'Anomaly\UsersModule\User\Notification\PasswordInvalidated' => \App\Notification\PasswordInvalidated::class,
// 'Anomaly\UsersModule\User\Notification\ResetYourPassword' => \App\Notification\ResetYourPassword::class,
// 'Anomaly\UsersModule\User\Notification\UserHasBeenActivated' => \App\Notification\UserHasBeenActivated::class,
// 'Anomaly\UsersModule\User\Notification\UserHasRegistered' => \App\Notification\UserHasRegistered::class,
// 'Anomaly\UsersModule\User\Notification\UserPendingActivation' => \App\Notification\UserPendingActivation::class,
], ],
]; ];

View File

@ -88,7 +88,7 @@ return [
*/ */
'middleware' => [ 'middleware' => [
\Fruitcake\Cors\HandleCors::class, # this line \Illuminate\Http\Middleware\HandleCors::class
], ],
/* /*

View File

@ -16,7 +16,6 @@ use Illuminate\Support\Facades\DB;
use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\ArgvInput;
use Visiosoft\AdvsModule\Adv\Command\DeleteInstaller; use Visiosoft\AdvsModule\Adv\Command\DeleteInstaller;
use WidgetSeeder; use WidgetSeeder;
use ZipArchive;
class DatabaseSeeder extends Seeder class DatabaseSeeder extends Seeder
{ {
@ -95,7 +94,7 @@ class DatabaseSeeder extends Seeder
$this->call(WidgetSeeder::class); $this->call(WidgetSeeder::class);
//Delete Installer //Delete Installer
dispatch_now(new DeleteInstaller()); dispatch_sync(new DeleteInstaller());
if (is_null($this->folders->findBy('slug', 'ads_excel'))) { if (is_null($this->folders->findBy('slug', 'ads_excel'))) {
$disk = $this->disks->findBySlug('local'); $disk = $this->disks->findBySlug('local');