Merge branch 'master' into dev/reseller
8e4d64aeb1d3Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'master' into dev/reseller

Details

Provenance

machniak	Authored on May 7 2021, 1:40 PM
machniak	Pushed on May 7 2021, 3:39 PM

Parents

rK1f18551de62a: Cleanup phpstan config
rK5fa8cd3e7be0: Merge branch 'master' into dev/reseller

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rK8e4d64aeb1d3: Merge branch 'master' into dev/reseller (authored by machniak).May 7 2021, 1:40 PM

Merged Changes

1f18551de62a Cleanup phpstan config
Author
machniak
Browse Repository
Passed
No Audits
addb347dac2a Move some code from webpack config to the before.php script
Author
machniak
Browse Repository
Passed
No Audits
b28c33417f00 Fix test regressions
Author
machniak
Browse Repository
Passed
No Audits
18a7cd7dbd77 Localization with vue-i18n
Author
machniak
Revisions
D2395: Localization with vue-i18n
Browse Repository
Passed
No Audits
e11caabd056a [Admin] Distribution lists UI
Author
machniak
Revisions
D2506: [Admin] Distribution lists UI
Browse Repository
Passed
No Audits
365f9e9602b9 [User] Distribution lists UI
Author
machniak
Revisions
D2500: [User] Distribution lists UI
Browse Repository
Passed
No Audits
757939464319 Display existing entitlement cost instead of the SKU cost where appropriate
Author
machniak
Revisions
D2512: Display existing entitlement cost instead of the SKU cost where appropriate
Browse Repository
Passed
No Audits

Changes (88)

Path

Size

src/

.env.example

.gitignore

app/

Backends/

LDAP.php

Console/

Commands/

Group/

AddMemberCommand.php

CreateCommand.php

Handlers/

Distlist.php

Http/

Controllers/

API/

V4/

Admin/

GroupsController.php

UsersController.php

GroupsController.php

OpenViduController.php

UsersController.php

ContentController.php

Controller.php

Kernel.php

Middleware/

Locale.php

Jobs/

Group/

config/

database/

migrations/

2021_04_22_120000_add_distlist_beta_sku.php

seeds/

local/

production/

resources/

build/

before.php

js/

admin/

user/

lang/

en/

themes/

default/

pages/

vue/

Admin/

User/

Widgets/

routes/

tests/

Browser/

Admin/

Components/

Meet/

Pages/

Admin/

	Distlist.php
	User.php

Feature/

Console/

Group/

AddMemberTest.php

Controller/

Admin/

Jobs/

Group/

rK8e4d64aeb1d3

View Options

src/.env.example

View Options

src/.gitignore

View Options

src/app/Backends/LDAP.php

View Options

src/app/Console/Commands/Group/AddMemberCommand.php

View Options

src/app/Console/Commands/Group/CreateCommand.php

View Options

src/app/Handlers/Distlist.php

View Options

src/app/Http/Controllers/API/V4/Admin/GroupsController.php

View Options

src/app/Http/Controllers/API/V4/Admin/UsersController.php

View Options

src/app/Http/Controllers/API/V4/GroupsController.php

View Options

src/app/Http/Controllers/API/V4/OpenViduController.php

View Options

src/app/Http/Controllers/API/V4/UsersController.php

View Options

src/app/Http/Controllers/ContentController.php

View Options

src/app/Http/Controllers/Controller.php

View Options

src/app/Http/Kernel.php

View Options

src/app/Http/Middleware/Locale.php

View Options

src/app/Jobs/Group/UpdateJob.php

View Options

src/app/User.php

View Options

src/app/Utils.php

View Options

src/composer.json

View Options

src/config/app.php

View Options

src/database/migrations/2021_04_22_120000_add_distlist_beta_sku.php

View Options

src/database/seeds/local/SkuSeeder.php

View Options

src/database/seeds/production/SkuSeeder.php

View Options

src/package-lock.json

View Options

src/package.json

View Options

src/phpstan.neon

View Options

src/resources/build/before.php

View Options

src/resources/js/admin/routes.js

View Options

src/resources/js/app.js

View Options

src/resources/js/fontawesome.js

View Options

src/resources/js/locale.js

View Options

src/resources/js/user/routes.js

View Options

src/resources/lang/de/ui.php

View Options

src/resources/lang/en/app.php

View Options

src/resources/lang/en/pagination.php

View Options

src/resources/lang/en/passwords.php

View Options

src/resources/lang/en/ui.php

View Options

src/resources/lang/en/validation.php

View Options

src/resources/themes/default/lang/de/faq.php

View Options

src/resources/themes/default/lang/de/menu.php

View Options

src/resources/themes/default/lang/de/support.php

View Options

src/resources/themes/default/lang/en/faq.php

View Options

src/resources/themes/default/lang/en/menu.php

View Options

src/resources/themes/default/lang/en/support.php

View Options

src/resources/themes/default/pages/support.blade.php

View Options

src/resources/themes/default/theme.json

View Options

src/resources/themes/menu.scss

View Options

src/resources/vue/Admin/Distlist.vue

View Options

src/resources/vue/Admin/Domain.vue

View Options

src/resources/vue/Admin/User.vue

View Options

src/resources/vue/Dashboard.vue

View Options

src/resources/vue/Distlist/Info.vue

View Options

src/resources/vue/Distlist/List.vue

View Options

src/resources/vue/Login.vue

View Options

src/resources/vue/User/Info.vue

View Options

src/resources/vue/Widgets/ListInput.vue

View Options

src/resources/vue/Widgets/Menu.vue

View Options

src/resources/vue/Widgets/Status.vue

View Options

src/routes/api.php

View Options

src/tests/Browser/Admin/DistlistTest.php

View Options

src/tests/Browser/Admin/LogonTest.php

View Options

src/tests/Browser/Admin/UserTest.php

View Options

src/tests/Browser/Components/Menu.php

View Options

src/tests/Browser/DistlistTest.php

View Options

src/tests/Browser/LogonTest.php

View Options

src/tests/Browser/Meet/RoomSetupTest.php

View Options

src/tests/Browser/Pages/Admin/Distlist.php

View Options

src/tests/Browser/Pages/Admin/User.php

View Options

src/tests/Browser/Pages/DistlistInfo.php

View Options

src/tests/Browser/Pages/DistlistList.php

View Options

src/tests/Browser/Pages/Home.php

View Options

src/tests/Browser/SignupTest.php

View Options

src/tests/Browser/UsersTest.php

View Options

src/tests/Feature/Console/Group/AddMemberTest.php

View Options

src/tests/Feature/Controller/Admin/GroupsTest.php

View Options

src/tests/Feature/Controller/Admin/UsersTest.php

View Options

src/tests/Feature/Controller/GroupsTest.php

View Options

src/tests/Feature/Controller/SkusTest.php

View Options

src/tests/Feature/Controller/UsersTest.php

View Options

src/tests/Feature/Jobs/Group/UpdateTest.php

View Options

src/tests/Feature/UserTest.php

View Options

src/tests/TestCaseTrait.php

View Options

Merge branch 'master' into dev/reseller8e4d64aeb1d3UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (88)

rK8e4d64aeb1d3

src/.env.example

src/.gitignore

src/app/Backends/LDAP.php

src/app/Console/Commands/Group/AddMemberCommand.php

src/app/Console/Commands/Group/CreateCommand.php

src/app/Handlers/Distlist.php

src/app/Http/Controllers/API/V4/Admin/GroupsController.php

src/app/Http/Controllers/API/V4/Admin/UsersController.php

src/app/Http/Controllers/API/V4/GroupsController.php

src/app/Http/Controllers/API/V4/OpenViduController.php

src/app/Http/Controllers/API/V4/UsersController.php

src/app/Http/Controllers/ContentController.php

src/app/Http/Controllers/Controller.php

src/app/Http/Kernel.php

src/app/Http/Middleware/Locale.php

src/app/Jobs/Group/UpdateJob.php

src/app/User.php

src/app/Utils.php

src/composer.json

src/config/app.php

src/database/migrations/2021_04_22_120000_add_distlist_beta_sku.php

src/database/seeds/local/SkuSeeder.php

src/database/seeds/production/SkuSeeder.php

src/package-lock.json

src/package.json

src/phpstan.neon

src/resources/build/before.php

src/resources/js/admin/routes.js

src/resources/js/app.js

src/resources/js/fontawesome.js

src/resources/js/locale.js

src/resources/js/user/routes.js

src/resources/lang/de/ui.php

src/resources/lang/en/app.php

src/resources/lang/en/pagination.php

src/resources/lang/en/passwords.php

src/resources/lang/en/ui.php

src/resources/lang/en/validation.php

src/resources/themes/default/lang/de/faq.php

src/resources/themes/default/lang/de/menu.php

src/resources/themes/default/lang/de/support.php

src/resources/themes/default/lang/en/faq.php

src/resources/themes/default/lang/en/menu.php

src/resources/themes/default/lang/en/support.php

src/resources/themes/default/pages/support.blade.php

src/resources/themes/default/theme.json

src/resources/themes/menu.scss

src/resources/vue/Admin/Distlist.vue

src/resources/vue/Admin/Domain.vue

src/resources/vue/Admin/User.vue

src/resources/vue/Dashboard.vue

src/resources/vue/Distlist/Info.vue

src/resources/vue/Distlist/List.vue

src/resources/vue/Login.vue

src/resources/vue/User/Info.vue

src/resources/vue/Widgets/ListInput.vue

src/resources/vue/Widgets/Menu.vue

src/resources/vue/Widgets/Status.vue

src/routes/api.php

src/tests/Browser/Admin/DistlistTest.php

src/tests/Browser/Admin/LogonTest.php

src/tests/Browser/Admin/UserTest.php

src/tests/Browser/Components/Menu.php

src/tests/Browser/DistlistTest.php

src/tests/Browser/LogonTest.php

src/tests/Browser/Meet/RoomSetupTest.php

src/tests/Browser/Pages/Admin/Distlist.php

src/tests/Browser/Pages/Admin/User.php

src/tests/Browser/Pages/DistlistInfo.php

src/tests/Browser/Pages/DistlistList.php

src/tests/Browser/Pages/Home.php

src/tests/Browser/SignupTest.php

Merge branch 'master' into dev/reseller
8e4d64aeb1d3Unpublished
Actions