kolab
e9de95957da9
Actions

Description

Merge branch 'master' of ssh://git.kolab.org/source/kolab

Details

Provenance

machniak	Authored on Sep 19 2019, 2:47 PM
machniak	Pushed on Sep 19 2019, 2:48 PM

Parents

rK253428c64e57: Registration form skeleton
rKfb30d6405a92: Linting and documentation, add geoip and currency

Branches

Unknown

Tags

Unknown

Build Status

Buildable 25999

Event Timeline

machniak committed rKe9de95957da9: Merge branch 'master' of ssh://git.kolab.org/source/kolab (authored by machniak).Sep 19 2019, 2:47 PM

Harbormaster completed building B25999: rKe9de95957da9: Merge branch 'master' of ssh://git.kolab.org/source/kolab.Sep 19 2019, 2:48 PM

Merged Changes

fb30d6405a92 Linting and documentation, add geoip and currency
Author
vanmeeuwen
Browse Repository
No Builds
No Audits
0bdb4a5f8774 Add linting and documentation
Author
vanmeeuwen
Browse Repository
No Builds
No Audits
645d57a21bbb Move boot functions to observers
Author
vanmeeuwen
Browse Repository
No Builds
No Audits

Changes (33)

Path

Size

src/

app/

Http/

Controllers/

API/

EntitlementsController.php

UsersController.php

WalletsController.php

Observers/

EntitlementObserver.php

SkuObserver.php

UserObserver.php

WalletObserver.php

Providers/

AppServiceProvider.php

BroadcastServiceProvider.php

RouteServiceProvider.php

Sku.php

Traits/

UserSettingsTrait.php

config/

database/

migrations/

	2014_10_12_000000_create_users_table.php
	2019_09_17_132012_create_user_settings_table.php

2019_09_17_132012_create_user_settings_table.php

public/

images/

icons/

splash-2048x2732.png

reinitdb.sh

tests/

Feature/

ExampleTest.php

UserAccountTest.php

UserWalletTest.php

UsersApiControllerTest.php

rKe9de95957da9

View Options

phpcs.xml

View Options

phpdoc.dist.xml

View Options

src/.gitignore

View Options

src/app/Entitlement.php

View Options

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

View Options

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

View Options

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

View Options

src/app/Observers/EntitlementObserver.php

View Options

src/app/Observers/SkuObserver.php

View Options

src/app/Observers/UserObserver.php

View Options

src/app/Observers/WalletObserver.php

View Options

src/app/Providers/AppServiceProvider.php

View Options

src/app/Providers/BroadcastServiceProvider.php

View Options

src/app/Providers/RouteServiceProvider.php

View Options

src/app/Sku.php

View Options

src/app/Traits/UserSettingsTrait.php

View Options

src/app/User.php

View Options

src/app/UserSetting.php

View Options

src/app/Utils.php

View Options

src/app/Wallet.php

View Options

src/composer.json

View Options

src/composer.lock

View Options

src/config/currency.php

View Options

src/config/geoip.php

View Options

src/database/database.sqlite

View Options

src/database/migrations/2014_10_12_000000_create_users_table.php

View Options

src/database/migrations/2019_09_17_132012_create_user_settings_table.php

View Options

src/public/images/icons/splash-2048x2732.png

View Options

src/reinitdb.sh

View Options

src/tests/Feature/ExampleTest.php

View Options

src/tests/Feature/UserAccountTest.php

View Options

src/tests/Feature/UserWalletTest.php

View Options

src/tests/Feature/UsersApiControllerTest.php

Merge branch 'master' of ssh://git.kolab.org/source/kolabe9de95957da9Actions

Description

Details

Event Timeline

Merged Changes

Changes (33)

rKe9de95957da9

phpcs.xml

phpdoc.dist.xml

src/.gitignore

src/app/Entitlement.php

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

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

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

src/app/Observers/EntitlementObserver.php

src/app/Observers/SkuObserver.php

src/app/Observers/UserObserver.php

src/app/Observers/WalletObserver.php

src/app/Providers/AppServiceProvider.php

src/app/Providers/BroadcastServiceProvider.php

src/app/Providers/RouteServiceProvider.php

src/app/Sku.php

src/app/Traits/UserSettingsTrait.php

src/app/User.php

src/app/UserSetting.php

src/app/Utils.php

src/app/Wallet.php

src/composer.json

src/composer.lock

src/config/currency.php

src/config/geoip.php

src/database/database.sqlite

src/database/migrations/2014_10_12_000000_create_users_table.php

src/database/migrations/2019_09_17_132012_create_user_settings_table.php

src/public/images/icons/splash-2048x2732.png

src/reinitdb.sh

src/tests/Feature/ExampleTest.php

src/tests/Feature/UserAccountTest.php

src/tests/Feature/UserWalletTest.php

src/tests/Feature/UsersApiControllerTest.php

Merge branch 'master' of ssh://git.kolab.org/source/kolab
e9de95957da9
Actions