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

Authored by machniak on Tue, Jun 1, 12:05 PM.

Description

Merge branch 'master' into dev/reseller

Committed

machniak

Tue, Jun 1, 12:05 PM

Pushed

machniak

Tue, Jun 1, 12:05 PM

Parents

Branches

Unknown

Tags

Unknown

Commit		Author	Details	Committed
acf48440adde	D2518	machniak	UI localization (partial)	Jun 1
a0069a7d5489	D2524	machniak	Introduce a unified mechanism for permissions checking in the UI	Jun 1
c0d53e595379	D2410	mollekopf	rcube_imap_generic.php fixes	May 27
35036d332a8f	D2560	machniak	Fix memory issue in wallet:charge command	May 27

				Path	Packages
	M			src/app/Console/Commands/WalletCharge.php
	M			src/include/rcube_imap_generic.php
	M			src/resources/js/app.js
	M			src/resources/js/meet/app.js
	M			src/resources/js/user/routes.js
	M			src/resources/lang/de/ui.php
	M			src/resources/lang/en/ui.php
	M			src/resources/themes/app.scss
	M			src/resources/views/layouts/app.blade.php
	M			src/resources/views/root.blade.php
	M			src/resources/vue/App.vue
	M			src/resources/vue/Distlist/Info.vue
	M			src/resources/vue/Distlist/List.vue
	M			src/resources/vue/Login.vue
	M			src/resources/vue/Meet/Room.vue
	M			src/resources/vue/Meet/RoomOptions.vue
	M			src/resources/vue/PasswordReset.vue
	M			src/resources/vue/Rooms.vue
	M			src/resources/vue/Widgets/StatusMessage.vue
	M			src/tests/Browser.php
	M			src/tests/Browser/Components/Error.php
	M			src/tests/Browser/DistlistTest.php
	M			src/tests/Browser/UserProfileTest.php
	M			src/tests/Browser/UsersTest.php
	M			src/tests/Browser/WalletTest.php
	M			src/tests/Feature/Console/WalletChargeTest.php