Merge branch 'master' into dev/kolabmeet
cb2af46c952aUnpublished
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/kolabmeet

Details

Provenance

mollekopf	Authored on Oct 6 2021, 9:23 AM
mollekopf	Pushed on Oct 6 2021, 9:23 AM

Parents

rK4c9db1b3885e: OpenViduRoomSeeder -> MeetRoomSeeder
rKb6665965aa15: Add some missing French localizations

Branches

Unknown

Tags

Unknown

Event Timeline

mollekopf committed rKcb2af46c952a: Merge branch 'master' into dev/kolabmeet (authored by mollekopf).Oct 6 2021, 9:23 AM

mollekopf mentioned this in D2978: Mediasoup based Kolab Meet.Oct 28 2021, 1:56 PM

mollekopf mentioned this in rK6752c9017087: Mediasoup based Kolab Meet.Oct 28 2021, 2:51 PM

mollekopf mentioned this in rK7cba90fb9997: Mediasoup based Kolab Meet.Nov 2 2021, 10:15 AM

mollekopf mentioned this in rK89a0dc9cecd8: Mediasoup based Kolab Meet.Nov 2 2021, 10:21 AM

mollekopf mentioned this in rK3418f08b1d76: Mediasoup based Kolab Meet.Nov 15 2021, 9:33 AM

mollekopf mentioned this in rK453308047315: Mediasoup based Kolab Meet.Nov 16 2021, 4:00 PM

mollekopf mentioned this in rK3ce479c091c2: Mediasoup based Kolab Meet.Nov 16 2021, 4:19 PM

mollekopf mentioned this in rK944d24a6e7d4: Mediasoup based Kolab Meet.Nov 17 2021, 10:47 AM

mollekopf mentioned this in rK6a431c85fa2a: Mediasoup based Kolab Meet.Nov 17 2021, 12:44 PM

mollekopf mentioned this in rKefc3f97a9fb6: Mediasoup based Kolab Meet.Nov 19 2021, 11:22 AM

mollekopf mentioned this in rKeec7f7e7f76a: Mediasoup based Kolab Meet.Nov 26 2021, 1:57 PM

mollekopf mentioned this in rKcafc2445c29f: Mediasoup based Kolab Meet.Dec 5 2021, 10:15 PM

mollekopf mentioned this in rK2889ad51a9f9: Mediasoup based Kolab Meet.Dec 21 2021, 4:44 PM

mollekopf mentioned this in rKbc73f37e7318: Mediasoup based Kolab Meet.

mollekopf mentioned this in rK7bd4fda6de8f: Mediasoup based Kolab Meet.Jan 6 2022, 1:05 PM

mollekopf mentioned this in rK1b2d96e7e0c5: Mediasoup based Kolab Meet.Jan 9 2022, 8:24 PM

mollekopf mentioned this in rK7e00d6e8997f: Mediasoup based Kolab Meet.Jan 10 2022, 12:13 PM

mollekopf mentioned this in rKf3b1e517e3b2: Mediasoup based Kolab Meet.Jan 13 2022, 2:33 PM

mollekopf mentioned this in rK5a96cec26d6e: Mediasoup based Kolab Meet.Jan 18 2022, 1:47 PM

mollekopf mentioned this in rK9b36c1c15b08: Mediasoup based Kolab Meet.Jan 26 2022, 11:04 AM

mollekopf mentioned this in rKc50fa32bf61a: Mediasoup based Kolab Meet.Jan 27 2022, 2:56 PM

mollekopf mentioned this in rK87b929256e37: Mediasoup based Kolab Meet.Jan 27 2022, 3:14 PM

mollekopf mentioned this in rK8c6f869bf6e6: Mediasoup based Kolab Meet.Feb 15 2022, 10:21 AM

mollekopf mentioned this in rK3492bab93d8f: Mediasoup based Kolab Meet.Feb 27 2022, 7:54 PM

mollekopf mentioned this in rKbca30db466a5: Mediasoup based Kolab Meet.Feb 28 2022, 9:46 AM

mollekopf mentioned this in rKabc716913c79: Mediasoup based Kolab Meet.Mar 11 2022, 3:03 PM

mollekopf mentioned this in rK614aff62fb5b: Mediasoup based Kolab Meet.Mar 21 2022, 11:48 AM

mollekopf mentioned this in rKddc54ff380a6: Mediasoup based Kolab Meet.Apr 4 2022, 1:24 PM

mollekopf mentioned this in rK8d10f0001681: Mediasoup based Kolab Meet.Apr 21 2022, 12:29 PM

Merged Changes

b6665965aa15 Add some missing French localizations
Author
machniak
Browse Repository
Passed
No Audits
3b9008f37d48 Fix access to trashed entitlement's entitleable
Author
machniak
Revisions
D2888: Fix access to trashed entitlement's entitleable
Browse Repository
Passed
No Audits
d9918c52bed9 Add "Enable beta program" button for admins/resellers
Author
machniak
Revisions
D2876: Add "Enable beta program" button for admins/resellers
Browse Repository
Passed
No Audits
d7e72e2f94d4 Move domain-related commands to a subfolder, add tests
Author
machniak
Revisions
D2870: Move domain-related commands to a subfolder, add tests
Browse Repository
Passed
No Audits
da0ccefd1a9b Fix domain selector on signup
Author
machniak
Browse Repository
Passed
No Audits
de191366a97b phpcs
Author
mollekopf
Browse Repository
Passed
No Audits
ab77192f2aff UserSetting scalpel commands
Author
mollekopf
Revisions
D2803: UserSetting scalpel commands
Browse Repository
Passed
No Audits
fddeb925aefb Drop redundant index
Author
mollekopf
Revisions
D2854: Drop redundant index
Browse Repository
Passed
No Audits
5ae2e7a89350 Avoid extra query if we know no entry exists
Author
mollekopf
Revisions
D2851: Avoid extra query if we know no entry exists
Browse Repository
Passed
No Audits
a4534ed6c24f Greylist/Request: simplify logic
Author
mollekopf
Revisions
D2845: Greylist/Request simplify logic
Browse Repository
Passed
No Audits
b869129bc47a Greylist/Request: Avoid unnecessary queries
Author
mollekopf
Revisions
D2839: Greylist/Request: Avoid unnecessary queries
Browse Repository
Passed
No Audits
8beb43d39950 Avoid large queries in greylist request
Author
mollekopf
Revisions
D2833: Avoid large queries in greylist request
Browse Repository
Passed
No Audits

Changes (55)

Path

Size

src/

app/

Console/

Commands/

Domain/

CreateCommand.php

DeleteCommand.php

	Domain/

	RestoreCommand.php
	DomainRestore.php

	SetStatusCommand.php
	DomainSetStatus.php

	SetWalletCommand.php
	DomainSetWallet.php

	StatusCommand.php
	DomainStatus.php

	SuspendCommand.php
	DomainSuspend.php

	UnsuspendCommand.php
	DomainUnsuspend.php

Scalpel/

UserSetting/

	CreateCommand.php
	ReadCommand.php

	UpdateCommand.php
	ReadCommand.php

Kernel.php

Entitlement.php

Http/

Controllers/

API/

AuthController.php

PasswordResetController.php

SignupController.php

V4/

Admin/

DomainsController.php

Policy/

Greylist/

Request.php

database/

migrations/

2021_08_27_105020_drop_greylist_connect_index.php

resources/

lang/

en/

fr/

vue/

Admin/

User.vue

Signup.vue

routes/

api.php

tests/

Browser/

Admin/

UserTest.php

Reseller/

UserTest.php

SignupTest.php

Feature/

Console/

	Domain/

	DeleteTest.php
	DomainRestoreTest.php

	RestoreTest.php
	DomainRestoreTest.php

DomainRestoreTest.php

DomainsTest.php

Controller/

Admin/

Reseller/

Stories/

rKcb2af46c952a

View Options

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

View Options

src/app/Console/Commands/Domain/DeleteCommand.php

View Options

src/app/Console/Commands/Domain/RestoreCommand.php

View Options

src/app/Console/Commands/Domain/SetStatusCommand.php

View Options

src/app/Console/Commands/Domain/SetWalletCommand.php

View Options

src/app/Console/Commands/Domain/StatusCommand.php

View Options

src/app/Console/Commands/Domain/SuspendCommand.php

View Options

src/app/Console/Commands/Domain/UnsuspendCommand.php

View Options

src/app/Console/Commands/DomainList.php

View Options

src/app/Console/Commands/DomainRestore.php

View Options

src/app/Console/Commands/DomainSetStatus.php

View Options

src/app/Console/Commands/DomainSetWallet.php

View Options

src/app/Console/Commands/DomainStatus.php

View Options

src/app/Console/Commands/DomainSuspend.php

View Options

src/app/Console/Commands/DomainUnsuspend.php

View Options

src/app/Console/Commands/Scalpel/UserSetting/CreateCommand.php

View Options

src/app/Console/Commands/Scalpel/UserSetting/UpdateCommand.php

View Options

src/app/Console/Kernel.php

View Options

src/app/Entitlement.php

View Options

src/app/Http/Controllers/API/AuthController.php

View Options

src/app/Http/Controllers/API/PasswordResetController.php

View Options

src/app/Http/Controllers/API/SignupController.php

View Options

src/app/Http/Controllers/API/V4/Admin/DomainsController.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/UsersController.php

View Options

src/app/Policy/Greylist/Request.php

View Options

src/database/migrations/2021_08_27_105020_drop_greylist_connect_index.php

View Options

src/resources/lang/en/app.php

View Options

src/resources/lang/en/ui.php

View Options

src/resources/lang/fr/app.php

View Options

src/resources/lang/fr/ui.php

View Options

src/resources/vue/Admin/User.vue

View Options

src/resources/vue/Signup.vue

View Options

src/routes/api.php

View Options

src/tests/Browser/Admin/UserTest.php

View Options

src/tests/Browser/Reseller/UserTest.php

View Options

src/tests/Browser/SignupTest.php

View Options

src/tests/Feature/Console/Domain/CreateTest.php

View Options

src/tests/Feature/Console/Domain/DeleteTest.php

View Options

src/tests/Feature/Console/Domain/RestoreTest.php

View Options

src/tests/Feature/Console/Domain/SetStatusTest.php

View Options

src/tests/Feature/Console/Domain/SetWalletTest.php

View Options

src/tests/Feature/Console/Domain/StatusTest.php

View Options

src/tests/Feature/Console/Domain/SuspendTest.php

View Options

src/tests/Feature/Console/Domain/UnsuspendTest.php

View Options

src/tests/Feature/Console/Domain/UsersTest.php

View Options

src/tests/Feature/Console/DomainRestoreTest.php

View Options

src/tests/Feature/Console/DomainsTest.php

View Options

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

View Options

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

View Options

src/tests/Feature/EntitlementTest.php

View Options

src/tests/Feature/Stories/GreylistTest.php

Merge branch 'master' into dev/kolabmeetcb2af46c952aUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (55)

rKcb2af46c952a

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

src/app/Console/Commands/Domain/DeleteCommand.php

src/app/Console/Commands/Domain/RestoreCommand.php

src/app/Console/Commands/Domain/SetStatusCommand.php

src/app/Console/Commands/Domain/SetWalletCommand.php

src/app/Console/Commands/Domain/StatusCommand.php

src/app/Console/Commands/Domain/SuspendCommand.php

src/app/Console/Commands/Domain/UnsuspendCommand.php

src/app/Console/Commands/DomainList.php

src/app/Console/Commands/DomainRestore.php

src/app/Console/Commands/DomainSetStatus.php

src/app/Console/Commands/DomainSetWallet.php

src/app/Console/Commands/DomainStatus.php

src/app/Console/Commands/DomainSuspend.php

src/app/Console/Commands/DomainUnsuspend.php

src/app/Console/Commands/Scalpel/UserSetting/CreateCommand.php

src/app/Console/Commands/Scalpel/UserSetting/UpdateCommand.php

src/app/Console/Kernel.php

src/app/Entitlement.php

src/app/Http/Controllers/API/AuthController.php

src/app/Http/Controllers/API/PasswordResetController.php

src/app/Http/Controllers/API/SignupController.php

src/app/Http/Controllers/API/V4/Admin/DomainsController.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/UsersController.php

src/app/Policy/Greylist/Request.php

src/database/migrations/2021_08_27_105020_drop_greylist_connect_index.php

src/resources/lang/en/app.php

src/resources/lang/en/ui.php

src/resources/lang/fr/app.php

src/resources/lang/fr/ui.php

src/resources/vue/Admin/User.vue

src/resources/vue/Signup.vue

src/routes/api.php

src/tests/Browser/Admin/UserTest.php

src/tests/Browser/Reseller/UserTest.php

src/tests/Browser/SignupTest.php

src/tests/Feature/Console/Domain/CreateTest.php

src/tests/Feature/Console/Domain/DeleteTest.php

src/tests/Feature/Console/Domain/RestoreTest.php

src/tests/Feature/Console/Domain/SetStatusTest.php

src/tests/Feature/Console/Domain/SetWalletTest.php

src/tests/Feature/Console/Domain/StatusTest.php

src/tests/Feature/Console/Domain/SuspendTest.php

src/tests/Feature/Console/Domain/UnsuspendTest.php

src/tests/Feature/Console/Domain/UsersTest.php

src/tests/Feature/Console/DomainRestoreTest.php

src/tests/Feature/Console/DomainsTest.php

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

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

src/tests/Feature/EntitlementTest.php

src/tests/Feature/Stories/GreylistTest.php

Merge branch 'master' into dev/kolabmeet
cb2af46c952aUnpublished
Actions