Merge branch 'master' into dev/kolabmeet
d9598d668fa5Unpublished
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 20 2021, 2:15 PM
machniak	Pushed on Aug 24 2021, 10:18 AM

Parents

rK593fe829901e: Remove static tenant_id from tests
rK229a1633a8e4: Merge branch 'dev/kolabmeet' of ssh://git.kolab.org/source/kolab into…

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rKd9598d668fa5: Merge branch 'master' into dev/kolabmeet (authored by machniak).Aug 20 2021, 2:15 PM

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:30 PM

Merged Changes

593fe829901e Remove static tenant_id from tests
Author
machniak
Browse Repository
Passed
No Audits
174af683b494 phpstan needs a guarantee that the property is set
Author
mollekopf
Revisions
D2764: phpstan needs a guarantee that the property is set
Browse Repository
Passed
No Audits
8afe78b5dfa5 Use uuid as AuthAttempt primarykey
Author
mollekopf
Revisions
D2773: Use uuid as AuthAttempt primarykey
Browse Repository
Passed
No Audits
e81e0f27796f NGINX Controller, 2fa for client connections and companion app support
Author
mollekopf
Revisions
D2674: NGINX Controller, 2fa for client connections and companion app support
Browse Repository
Passed
No Audits
79561bb028f7 Unset APP_LOCALES
Author
machniak
Browse Repository
Passed
No Audits
26b9b7245073 Fix locale leak under Swoole
Author
machniak
Browse Repository
Passed
No Audits
1eac065869c2 Laravel Passport support
Author
mollekopf
Revisions
D2494: Laravel Passport support
Browse Repository
Passed
No Audits
cf44d42f2a8c French localization
Author
machniak
Revisions
D2752: French localization
Browse Repository
Passed
No Audits

Changes (57)

Path

Size

bin/

quickstart.sh

docker-compose.yml

docker/

nginx/

src/

app/

Console/

Commands/

AuthAttempt

DeleteCommand.php

	AuthAttempt/

	ListCommand.php
	AuthAttemptList.php

	PurgeCommand.php
	AuthAttemptPurge.php

Http/

Controllers/

API/

AuthController.php

V4/

AuthAttemptsController.php

CompanionAppsController.php

	V4/

NGINXController.php

ContentController.php

Middleware/

Locale.php

Observers/

AuthAttemptObserver.php

Providers/

AppServiceProvider.php

config/

database/

migrations/

2021_03_25_144555_create_auth_attempts_table.php

2021_04_28_090011_create_oauth_tables.php

2021_05_05_134357_create_companion_apps_table.php

seeds/

local/

OauthClientSeeder.php

UserSeeder.php

phpstan.neon

resources/

js/

app.js

lang/

en/

	fr/
	en/

auth.php

themes/

default/

lang/

fr/

routes/

tests/

Browser/

LogonTest.php

Feature/

AuthAttemptTest.php

Console/

AuthAttempt/

Controller/

	CompanionAppsTest.php
	CompanionApps.php

NGINXTest.php

Reseller/

DomainsTest.php

rKd9598d668fa5

View Options

bin/quickstart.sh

View Options

docker-compose.yml

View Options

docker/nginx/Dockerfile

View Options

docker/nginx/nginx.conf

View Options

src/.env.example

View Options

src/app/AuthAttempt.php

View Options

src/app/CompanionApp.php

View Options

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

View Options

src/app/Console/Commands/AuthAttempt/ListCommand.php

View Options

src/app/Console/Commands/AuthAttempt/PurgeCommand.php

View Options

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

View Options

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

View Options

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

View Options

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

View Options

src/app/Http/Controllers/ContentController.php

View Options

src/app/Http/Middleware/Locale.php

View Options

src/app/Observers/AuthAttemptObserver.php

View Options

src/app/Providers/AppServiceProvider.php

View Options

src/composer.json

View Options

src/config/auth.php

View Options

src/config/firebase.php

View Options

src/config/imap.php

View Options

src/config/passport.php

View Options

src/config/swoole_http.php

View Options

src/database/migrations/2021_03_25_144555_create_auth_attempts_table.php

View Options

src/database/migrations/2021_04_28_090011_create_oauth_tables.php

View Options

src/database/migrations/2021_05_05_134357_create_companion_apps_table.php

View Options

src/database/seeds/local/OauthClientSeeder.php

View Options

src/database/seeds/local/UserSeeder.php

View Options

src/phpstan.neon

View Options

src/resources/js/app.js

View Options

src/resources/lang/en/ui.php

View Options

src/resources/lang/fr/app.php

View Options

src/resources/lang/fr/auth.php

View Options

src/resources/lang/fr/documents.php

View Options

src/resources/lang/fr/mail.php

View Options

src/resources/lang/fr/meet.php

View Options

src/resources/lang/fr/transactions.php

View Options

src/resources/lang/fr/ui.php

View Options

src/resources/lang/fr/validation.php

View Options

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

View Options

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

View Options

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

View Options

src/routes/api.php

View Options

src/tests/Browser/LogonTest.php

View Options

src/tests/Feature/AuthAttemptTest.php

View Options

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

View Options

src/tests/Feature/Console/AuthAttempt/ListTest.php

View Options

src/tests/Feature/Console/AuthAttempt/PurgeTest.php

View Options

src/tests/Feature/Controller/AuthAttemptsTest.php

View Options

src/tests/Feature/Controller/CompanionAppsTest.php

View Options

src/tests/Feature/Controller/NGINXTest.php

View Options

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

Merge branch 'master' into dev/kolabmeetd9598d668fa5UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (57)

rKd9598d668fa5

bin/quickstart.sh

docker-compose.yml

docker/nginx/Dockerfile

docker/nginx/nginx.conf

src/.env.example

src/app/AuthAttempt.php

src/app/CompanionApp.php

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

src/app/Console/Commands/AuthAttempt/ListCommand.php

src/app/Console/Commands/AuthAttempt/PurgeCommand.php

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

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

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

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

src/app/Http/Controllers/ContentController.php

src/app/Http/Middleware/Locale.php

src/app/Observers/AuthAttemptObserver.php

src/app/Providers/AppServiceProvider.php

src/composer.json

src/config/auth.php

src/config/firebase.php

src/config/imap.php

src/config/passport.php

src/config/swoole_http.php

src/database/migrations/2021_03_25_144555_create_auth_attempts_table.php

src/database/migrations/2021_04_28_090011_create_oauth_tables.php

src/database/migrations/2021_05_05_134357_create_companion_apps_table.php

src/database/seeds/local/OauthClientSeeder.php

src/database/seeds/local/UserSeeder.php

src/phpstan.neon

src/resources/js/app.js

src/resources/lang/en/ui.php

src/resources/lang/fr/app.php

src/resources/lang/fr/auth.php

src/resources/lang/fr/documents.php

src/resources/lang/fr/mail.php

src/resources/lang/fr/meet.php

src/resources/lang/fr/transactions.php

src/resources/lang/fr/ui.php

src/resources/lang/fr/validation.php

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

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

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

src/routes/api.php

src/tests/Browser/LogonTest.php

src/tests/Feature/AuthAttemptTest.php

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

src/tests/Feature/Console/AuthAttempt/ListTest.php

src/tests/Feature/Console/AuthAttempt/PurgeTest.php

src/tests/Feature/Controller/AuthAttemptsTest.php

src/tests/Feature/Controller/CompanionAppsTest.php

src/tests/Feature/Controller/NGINXTest.php

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

Merge branch 'master' into dev/kolabmeet
d9598d668fa5Unpublished
Actions