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

machniak	Authored on Aug 27 2021, 10:32 AM
machniak	Pushed on Aug 27 2021, 10:32 AM

Parents

rKc727cdd61b80: GreylistTest enhancements
rK0fe180f481ff: Get meet to work over the kolab.io proxy

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rK0e022287cd7f: Merge branch 'master' into dev/kolabmeet (authored by machniak).Aug 27 2021, 10:32 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:34 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:45 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

c727cdd61b80 GreylistTest enhancements
Author
mollekopf
Revisions
D2827: GreylistTest enhancements
Browse Repository
Passed
No Audits
887e95d73397 Avoid relying on hardcoded tenant ids in tests
Author
mollekopf
Revisions
D2785: Avoid relying on hardcoded tenant ids in tests
Browse Repository
Passed
No Audits
a53ecb760738 Fix greylisting setting
Author
machniak
Revisions
D2815: Fix greylisting setting
Browse Repository
Passed
No Audits
d72eac61398c Fix currency on user add/edit page, fix badges regression
Author
machniak
Revisions
D2821: Fix currency on user add/edit page, fix badges regression
Browse Repository
Passed
No Audits
098289d3f9b1 BelongsToTenantTrait
Author
mollekopf
Revisions
D2809: BelongsToTenantTrait
Browse Repository
Passed
No Audits
cdfdbedb8393 Use a UuidTrait instead of an observer
Author
mollekopf
Revisions
D2779: Use a UuidTrait instead of an observer
Browse Repository
Passed
No Audits
4bccbc918f6b Remove index from ordername
Author
vanmeeuwen
Browse Repository
Passed
No Audits
32f3068e08ab Set arg before annotation?
Author
vanmeeuwen
Browse Repository
Passed
No Audits
75c792dc4566 Also edit the annotation
Author
vanmeeuwen
Browse Repository
Passed
No Audits
68cde0444c9e Use a build argument for the swoole version/branch
Author
vanmeeuwen
Browse Repository
Passed
No Audits
0e209586f5d2 Don't use the ->uuid() laravel definition, just to make sure we're perfectly in…
Author
vanmeeuwen
Browse Repository
Passed
No Audits

Changes (56)

Path

Size

docker/

swoole/

Dockerfile

src/

app/

Http/

Controllers/

API/

V4/

PolicyController.php

IP4Net.php

IP6Net.php

Observers/

AuthAttemptObserver.php

DiscountObserver.php

DomainObserver.php

EntitlementObserver.php

GroupObserver.php

PackageObserver.php

PlanObserver.php

SignupInvitationObserver.php

SkuObserver.php

TransactionObserver.php

Policy/

Greylist/

Request.php

Setting.php

Providers/

AppServiceProvider.php

SignupInvitation.php

Sku.php

Traits/

BelongsToTenantTrait.php

database/

migrations/

2020_06_04_115409_create_powerdns_tables.php

2021_03_25_144555_create_auth_attempts_table.php

	2021_08_25_120000_drop_greylist_settings_table.php
	2020_02_26_000000_create_user_aliases_table.php

resources/

js/

app.js

meet/

app.js

vue/

Admin/

Meet/

Reseller/

User/

tests/

Browser/

Reseller/

UserTest.php

WalletTest.php

UsersTest.php

Feature/

Controller/

Stories/

rK0e022287cd7f

View Options

docker/swoole/Dockerfile

View Options

src/app/AuthAttempt.php

View Options

src/app/Discount.php

View Options

src/app/Domain.php

View Options

src/app/Entitlement.php

View Options

src/app/Group.php

View Options

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

View Options

src/app/IP4Net.php

View Options

src/app/IP6Net.php

View Options

src/app/Observers/AuthAttemptObserver.php

View Options

src/app/Observers/DiscountObserver.php

View Options

src/app/Observers/DomainObserver.php

View Options

src/app/Observers/EntitlementObserver.php

View Options

src/app/Observers/GroupObserver.php

View Options

src/app/Observers/PackageObserver.php

View Options

src/app/Observers/PlanObserver.php

View Options

src/app/Observers/SignupInvitationObserver.php

View Options

src/app/Observers/SkuObserver.php

View Options

src/app/Observers/TransactionObserver.php

View Options

src/app/Observers/UserObserver.php

View Options

src/app/Observers/WalletObserver.php

View Options

src/app/Package.php

View Options

src/app/Plan.php

View Options

src/app/Policy/Greylist/Request.php

View Options

src/app/Policy/Greylist/Setting.php

View Options

src/app/Providers/AppServiceProvider.php

View Options

src/app/SignupInvitation.php

View Options

src/app/Sku.php

View Options

src/app/Traits/BelongsToTenantTrait.php

View Options

src/app/Traits/UserConfigTrait.php

View Options

src/app/Traits/UuidIntKeyTrait.php

View Options

src/app/Traits/UuidStrKeyTrait.php

View Options

src/app/Transaction.php

View Options

src/app/User.php

View Options

src/app/Utils.php

View Options

src/app/Wallet.php

View Options

src/database/migrations/2020_06_04_115409_create_powerdns_tables.php

View Options

src/database/migrations/2021_03_25_144555_create_auth_attempts_table.php

View Options

src/database/migrations/2021_08_25_120000_drop_greylist_settings_table.php

View Options

src/resources/js/app.js

View Options

src/resources/js/meet/app.js

View Options

src/resources/vue/Admin/User.vue

View Options

src/resources/vue/Dashboard.vue

View Options

src/resources/vue/Meet/Room.vue

View Options

src/resources/vue/Reseller/Dashboard.vue

View Options

src/resources/vue/Rooms.vue

View Options

src/resources/vue/User/Info.vue

View Options

src/tests/Browser/Reseller/UserTest.php

View Options

src/tests/Browser/Reseller/WalletTest.php

View Options

src/tests/Browser/UsersTest.php

View Options

src/tests/Feature/Controller/SkusTest.php

View Options

src/tests/Feature/Controller/UsersTest.php

View Options

src/tests/Feature/DomainTest.php

View Options

src/tests/Feature/Stories/GreylistTest.php

View Options

src/tests/Feature/TenantTest.php

View Options

src/tests/Feature/UserTest.php

Merge branch 'master' into dev/kolabmeet0e022287cd7fUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (56)

rK0e022287cd7f

docker/swoole/Dockerfile

src/app/AuthAttempt.php

src/app/Discount.php

src/app/Domain.php

src/app/Entitlement.php

src/app/Group.php

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

src/app/IP4Net.php

src/app/IP6Net.php

src/app/Observers/AuthAttemptObserver.php

src/app/Observers/DiscountObserver.php

src/app/Observers/DomainObserver.php

src/app/Observers/EntitlementObserver.php

src/app/Observers/GroupObserver.php

src/app/Observers/PackageObserver.php

src/app/Observers/PlanObserver.php

src/app/Observers/SignupInvitationObserver.php

src/app/Observers/SkuObserver.php

src/app/Observers/TransactionObserver.php

src/app/Observers/UserObserver.php

src/app/Observers/WalletObserver.php

src/app/Package.php

src/app/Plan.php

src/app/Policy/Greylist/Request.php

src/app/Policy/Greylist/Setting.php

src/app/Providers/AppServiceProvider.php

src/app/SignupInvitation.php

src/app/Sku.php

src/app/Traits/BelongsToTenantTrait.php

src/app/Traits/UserConfigTrait.php

src/app/Traits/UuidIntKeyTrait.php

src/app/Traits/UuidStrKeyTrait.php

src/app/Transaction.php

src/app/User.php

src/app/Utils.php

src/app/Wallet.php

src/database/migrations/2020_06_04_115409_create_powerdns_tables.php

src/database/migrations/2021_03_25_144555_create_auth_attempts_table.php

src/database/migrations/2021_08_25_120000_drop_greylist_settings_table.php

src/resources/js/app.js

src/resources/js/meet/app.js

src/resources/vue/Admin/User.vue

src/resources/vue/Dashboard.vue

src/resources/vue/Meet/Room.vue

src/resources/vue/Reseller/Dashboard.vue

src/resources/vue/Rooms.vue

src/resources/vue/User/Info.vue

src/tests/Browser/Reseller/UserTest.php

src/tests/Browser/Reseller/WalletTest.php

src/tests/Browser/UsersTest.php

src/tests/Feature/Controller/SkusTest.php

src/tests/Feature/Controller/UsersTest.php

src/tests/Feature/DomainTest.php

src/tests/Feature/Stories/GreylistTest.php

src/tests/Feature/TenantTest.php

src/tests/Feature/UserTest.php

Merge branch 'master' into dev/kolabmeet
0e022287cd7fUnpublished
Actions