Merge branch 'master' into dev/reseller
021a0daf6855Unpublished
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 Jun 1 2021, 12:05 PM
machniak	Pushed on Jun 1 2021, 12:05 PM

Parents

rKacf48440adde: UI localization (partial)
rKb6cc7fc764ca: [Reseller] Wallet page

Branches

Unknown

Tags

Unknown

Event Timeline

machniak committed rK021a0daf6855: Merge branch 'master' into dev/reseller (authored by machniak).Jun 1 2021, 12:05 PM

Merged Changes

acf48440adde UI localization (partial)
Author
machniak
Revisions
D2518: UI localization (partial)
Browse Repository
Passed
No Audits
a0069a7d5489 Introduce a unified mechanism for permissions checking in the UI
Author
machniak
Revisions
D2524: Introduce a unified mechanism for permissions checking in the UI
Browse Repository
Passed
No Audits
c0d53e595379 rcube_imap_generic.php fixes
Author
mollekopf
Revisions
D2410: rcube_imap_generic.php fixes
Browse Repository
Passed
No Audits
35036d332a8f Fix memory issue in wallet:charge command
Author
machniak
Revisions
D2560: Fix memory issue in wallet:charge command
Browse Repository
Passed
No Audits

Changes (26)

Path

Size

src/

app/

Console/

Commands/

WalletCharge.php

include/

rcube_imap_generic.php

resources/

js/

app.js

meet/

app.js

user/

routes.js

lang/

de/

ui.php

en/

ui.php

themes/

app.scss

views/

layouts/

vue/

Distlist/

Meet/

Widgets/

tests/

Browser/

Components/

Feature/

Console/

WalletChargeTest.php

rK021a0daf6855

View Options

src/app/Console/Commands/WalletCharge.php

View Options

src/include/rcube_imap_generic.php

View Options

src/resources/js/app.js

View Options

src/resources/js/meet/app.js

View Options

src/resources/js/user/routes.js

View Options

src/resources/lang/de/ui.php

View Options

src/resources/lang/en/ui.php

View Options

src/resources/themes/app.scss

View Options

src/resources/views/layouts/app.blade.php

View Options

src/resources/views/root.blade.php

View Options

src/resources/vue/App.vue

View Options

src/resources/vue/Distlist/Info.vue

View Options

src/resources/vue/Distlist/List.vue

View Options

src/resources/vue/Login.vue

View Options

src/resources/vue/Meet/Room.vue

View Options

src/resources/vue/Meet/RoomOptions.vue

View Options

src/resources/vue/PasswordReset.vue

View Options

src/resources/vue/Rooms.vue

View Options

src/resources/vue/Widgets/StatusMessage.vue

View Options

src/tests/Browser.php

View Options

src/tests/Browser/Components/Error.php

View Options

src/tests/Browser/DistlistTest.php

View Options

src/tests/Browser/UserProfileTest.php

View Options

src/tests/Browser/UsersTest.php

View Options

src/tests/Browser/WalletTest.php

View Options

src/tests/Feature/Console/WalletChargeTest.php

Merge branch 'master' into dev/reseller021a0daf6855UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (26)

rK021a0daf6855

src/app/Console/Commands/WalletCharge.php

src/include/rcube_imap_generic.php

src/resources/js/app.js

src/resources/js/meet/app.js

src/resources/js/user/routes.js

src/resources/lang/de/ui.php

src/resources/lang/en/ui.php

src/resources/themes/app.scss

src/resources/views/layouts/app.blade.php

src/resources/views/root.blade.php

src/resources/vue/App.vue

src/resources/vue/Distlist/Info.vue

src/resources/vue/Distlist/List.vue

src/resources/vue/Login.vue

src/resources/vue/Meet/Room.vue

src/resources/vue/Meet/RoomOptions.vue

src/resources/vue/PasswordReset.vue

src/resources/vue/Rooms.vue

src/resources/vue/Widgets/StatusMessage.vue

src/tests/Browser.php

src/tests/Browser/Components/Error.php

src/tests/Browser/DistlistTest.php

src/tests/Browser/UserProfileTest.php

src/tests/Browser/UsersTest.php

src/tests/Browser/WalletTest.php

src/tests/Feature/Console/WalletChargeTest.php

Merge branch 'master' into dev/reseller
021a0daf6855Unpublished
Actions