Merge branch 'master' into dev/reseller
5fa8cd3e7be0Unpublished
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 5 2021, 2:11 PM
machniak	Pushed on May 5 2021, 2:11 PM

Parents

rK2a5209079916: Reseller Stats UI
rKbb367b9a0e38: Fix test regressions

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rK5fa8cd3e7be0: Merge branch 'master' into dev/reseller (authored by machniak).May 5 2021, 2:11 PM

Merged Changes

bb367b9a0e38 Fix test regressions
Author
machniak
Browse Repository
Passed
No Audits
627eb4f1844e Fix phpstan errors
Author
machniak
Browse Repository
Passed
No Audits
8e95b606b8d7 Fix wallet notice precision
Author
machniak
Revisions
D2464: Fix wallet notice precision
Browse Repository
Passed
No Audits
7e6b1576f5cf [Meet] Fix video elements sizing bug
Author
machniak
Revisions
D2470: [Meet] Fix video elements sizing bug
Browse Repository
Passed
No Audits
525d8a74d97e Use build year in the copyright footer
Author
machniak
Revisions
D2476: Use build year in the copyright footer
Browse Repository
Passed
No Audits
ce369e66b199 ux cleanup. move 'delete account' button to the top
Author
machniak
Revisions
D1954: ux cleanup. move 'delete account' button to the top
Browse Repository
Passed
No Audits
5e9dec8fad30 Remove "ON UPDATE" from expires_at column
Author
machniak
Revisions
D2440: Remove "ON UPDATE" from expires_at column
Browse Repository
Passed
No Audits
860a732fe330 Store request headers with signup codes
Author
vanmeeuwen
Revisions
D2482: Store request headers with signup codes
Browse Repository
Passed
No Audits
1335d6cf57ce Remove dead code
Author
machniak
Browse Repository
Passed
No Audits
cd9e7cbb1a3d Doesn't treat CIDR notations very well
Author
vanmeeuwen
Browse Repository
Passed
No Audits
8bf0909d311d Signup code refactoring
Author
machniak
Revisions
D2422: Signup code refactoring
Browse Repository
Passed
No Audits
10a5193ab0c2 Upgrade to laravel-mix v6 (webpack v5) and other js dependencies
Author
machniak
Revisions
D2401: Upgrade to laravel-mix v6 (webpack v5) and other js dependencies
Browse Repository
Passed
No Audits
6db46c2bba8f New Payment dialog structure
Author
mollekopf
Revisions
D2239: New Payment dialog structure
Browse Repository
Passed
No Audits

Changes (57)

Path

Size

src/

.gitignore

app/

Http/

Controllers/

API/

SignupController.php

V4/

PaymentsController.php

WalletsController.php

Controller.php

Kernel.php

Request.php

Jobs/

SignupVerificationEmail.php

Mail/

SignupVerification.php

Observers/

SignupCodeObserver.php

VerificationCodeObserver.php

Payment.php

Providers/

Payment/

	VerificationCode.php
	SignupCode.php

composer.json

database/

migrations/

2021_02_23_084157_payment_table_add_currency_columns.php

2021_03_25_100000_signup_code_refactor.php

	2021_04_08_150000_signup_code_headers.php
	2020_02_26_085835_entitlements_add_deleted_at.php

2021_04_08_160000_expires_at_column_fix.php

resources/

js/

meet/

themes/

default/

vue/

User/

Info.vue

Profile.vue

	User/
	Domain/

Widgets/

routes/

tests/

Browser/

LogonTest.php

PaymentMollieTest.php

PaymentStripeTest.php

SignupTest.php

UsersTest.php

WalletTest.php

Feature/

Controller/

PaymentsMollieTest.php

PaymentsStripeTest.php

Documents/

Jobs/

SignupVerificationEmailTest.php

SignupCodeTest.php

Unit/

Mail/

SignupVerificationTest.php

webpack.mix.js

rK5fa8cd3e7be0

View Options

src/.gitignore

View Options

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

View Options

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

View Options

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

View Options

src/app/Http/Controllers/Controller.php

View Options

src/app/Http/Kernel.php

View Options

src/app/Http/Request.php

View Options

src/app/Jobs/SignupVerificationEmail.php

View Options

src/app/Mail/SignupVerification.php

View Options

src/app/Observers/SignupCodeObserver.php

View Options

src/app/Observers/VerificationCodeObserver.php

View Options

src/app/Payment.php

View Options

src/app/Providers/Payment/Mollie.php

View Options

src/app/Providers/Payment/Stripe.php

View Options

src/app/Providers/PaymentProvider.php

View Options

src/app/SignupCode.php

View Options

src/app/User.php

View Options

src/app/Utils.php

View Options

src/app/VerificationCode.php

View Options

src/composer.json

View Options

src/database/migrations/2021_02_23_084157_payment_table_add_currency_columns.php

View Options

src/database/migrations/2021_03_25_100000_signup_code_refactor.php

View Options

src/database/migrations/2021_04_08_150000_signup_code_headers.php

View Options

src/database/migrations/2021_04_08_160000_expires_at_column_fix.php

View Options

src/package-lock.json

View Options

src/package.json

View Options

src/resources/build/before.php

View Options

src/resources/js/app.js

View Options

src/resources/js/bootstrap.js

View Options

src/resources/js/fontawesome.js

View Options

src/resources/js/meet/app.js

View Options

src/resources/themes/app.scss

View Options

src/resources/themes/default/_variables.scss

View Options

src/resources/vue/User/Info.vue

View Options

src/resources/vue/User/List.vue

View Options

src/resources/vue/User/Profile.vue

View Options

src/resources/vue/Wallet.vue

View Options

src/resources/vue/Widgets/Menu.vue

View Options

src/resources/vue/Widgets/PaymentLog.vue

View Options

src/routes/api.php

View Options

src/tests/Browser/LogonTest.php

View Options

src/tests/Browser/PaymentMollieTest.php

View Options

src/tests/Browser/PaymentStripeTest.php

View Options

src/tests/Browser/SignupTest.php

View Options

src/tests/Browser/UsersTest.php

View Options

src/tests/Browser/WalletTest.php

View Options

src/tests/Feature/Controller/PaymentsMollieTest.php

View Options

src/tests/Feature/Controller/PaymentsStripeTest.php

View Options

src/tests/Feature/Controller/SignupTest.php

View Options

src/tests/Feature/Controller/WalletsTest.php

View Options

src/tests/Feature/Documents/ReceiptTest.php

View Options

src/tests/Feature/Jobs/PaymentEmailTest.php

View Options

src/tests/Feature/Jobs/SignupVerificationEmailTest.php

View Options

src/tests/Feature/SignupCodeTest.php

View Options

src/tests/Unit/Mail/SignupVerificationTest.php

View Options

Merge branch 'master' into dev/reseller5fa8cd3e7be0UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (57)

rK5fa8cd3e7be0

src/.gitignore

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

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

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

src/app/Http/Controllers/Controller.php

src/app/Http/Kernel.php

src/app/Http/Request.php

src/app/Jobs/SignupVerificationEmail.php

src/app/Mail/SignupVerification.php

src/app/Observers/SignupCodeObserver.php

src/app/Observers/VerificationCodeObserver.php

src/app/Payment.php

src/app/Providers/Payment/Mollie.php

src/app/Providers/Payment/Stripe.php

src/app/Providers/PaymentProvider.php

src/app/SignupCode.php

src/app/User.php

src/app/Utils.php

src/app/VerificationCode.php

src/composer.json

src/database/migrations/2021_02_23_084157_payment_table_add_currency_columns.php

src/database/migrations/2021_03_25_100000_signup_code_refactor.php

src/database/migrations/2021_04_08_150000_signup_code_headers.php

src/database/migrations/2021_04_08_160000_expires_at_column_fix.php

src/package-lock.json

src/package.json

src/resources/build/before.php

src/resources/js/app.js

src/resources/js/bootstrap.js

src/resources/js/fontawesome.js

src/resources/js/meet/app.js

src/resources/themes/app.scss

src/resources/themes/default/_variables.scss

src/resources/vue/User/Info.vue

src/resources/vue/User/List.vue

src/resources/vue/User/Profile.vue

src/resources/vue/Wallet.vue

src/resources/vue/Widgets/Menu.vue

src/resources/vue/Widgets/PaymentLog.vue

src/routes/api.php

src/tests/Browser/LogonTest.php

src/tests/Browser/PaymentMollieTest.php

src/tests/Browser/PaymentStripeTest.php

src/tests/Browser/SignupTest.php

src/tests/Browser/UsersTest.php

src/tests/Browser/WalletTest.php

src/tests/Feature/Controller/PaymentsMollieTest.php

src/tests/Feature/Controller/PaymentsStripeTest.php

src/tests/Feature/Controller/SignupTest.php

src/tests/Feature/Controller/WalletsTest.php

src/tests/Feature/Documents/ReceiptTest.php

src/tests/Feature/Jobs/PaymentEmailTest.php

src/tests/Feature/Jobs/SignupVerificationEmailTest.php

src/tests/Feature/SignupCodeTest.php

src/tests/Unit/Mail/SignupVerificationTest.php

src/webpack.mix.js

Merge branch 'master' into dev/reseller
5fa8cd3e7be0Unpublished
Actions