archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-13 08:24:04 +00:00
Code Activity

Merge branch '3.x' of github.com:stancl/tenancy into 3.x

Browse source
This commit is contained in:
Samuel Štancl 2020-09-02 19:45:10 +02:00
commit 375380cc7e
4 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/ISSUE_TEMPLATE/config.yml vendored
View file

@ -2,4 +2,7 @@ blank_issues_enabled: false
contact_links: contact_links:
- name: Support Questions & Other - name: Support Questions & Other
url: https://github.com/stancl/tenancy/blob/3.x/SUPPORT.md url: https://github.com/stancl/tenancy/blob/3.x/SUPPORT.md
about: 'If you have a question or need help using the package' about: 'If you have a question or need help using the package.'
- name: Documentation Issue
url: https://github.com/stancl/tenancy-docs/issues
about: 'Suggest how the documentation could be improved.'

10
.github/ISSUE_TEMPLATE/documentation-issue.md vendored
View file

@ -1,10 +0,0 @@
---
name: "\U0001F4DA Documentation Issue"
about: Suggest how the documentation could be improved.
title: ''
labels: documentation
assignees: stancl
---

2
assets/TenancyServiceProvider.stub.php
View file

@ -136,7 +136,7 @@ class TenancyServiceProvider extends ServiceProvider
Middleware\InitializeTenancyByRequestData::class, Middleware\InitializeTenancyByRequestData::class,
]; ];
foreach ($tenancyMiddleware as $middleware) { foreach (array_reverse($tenancyMiddleware) as $middleware) {
$this->app[\Illuminate\Contracts\Http\Kernel::class]->prependToMiddlewarePriority($middleware); $this->app[\Illuminate\Contracts\Http\Kernel::class]->prependToMiddlewarePriority($middleware);
} }
} }

8
assets/config.php
View file

@ -92,7 +92,7 @@ return [
/** /**
* Filesystem tenancy config. Used by FilesystemTenancyBootstrapper. * Filesystem tenancy config. Used by FilesystemTenancyBootstrapper.
* https://tenancy.samuelstancl.me/docs/v2/filesystem-tenancy/. * https://tenancyforlaravel.com/docs/v3/tenancy-bootstrappers/#filesystem-tenancy-boostrapper.
*/ */
'filesystem' => [ 'filesystem' => [
/** /**
@ -108,7 +108,7 @@ return [
/** /**
* Use this for local disks. * Use this for local disks.
* *
* See https://tenancy.samuelstancl.me/docs/v2/filesystem-tenancy/ * See https://tenancyforlaravel.com/docs/v3/tenancy-bootstrappers/#filesystem-tenancy-boostrapper
*/ */
'root_override' => [ 'root_override' => [
// Disks whose roots should be overriden after storage_path() is suffixed. // Disks whose roots should be overriden after storage_path() is suffixed.
@ -165,8 +165,8 @@ return [
// Stancl\Tenancy\Features\UserImpersonation::class, // Stancl\Tenancy\Features\UserImpersonation::class,
// Stancl\Tenancy\Features\TelescopeTags::class, // Stancl\Tenancy\Features\TelescopeTags::class,
// Stancl\Tenancy\Features\UniversalRoutes::class, // Stancl\Tenancy\Features\UniversalRoutes::class,
// Stancl\Tenancy\Features\TenantConfig::class, // https://tenancy.samuelstancl.me/docs/v2/features/tenant-config/ // Stancl\Tenancy\Features\TenantConfig::class, // https://tenancyforlaravel.com/docs/v3/features/tenant-config
// Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancy.samuelstancl.me/docs/v2/features/tenant-redirect/ // Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
], ],
/** /**