Peter Papp 5d0348e2d0 Merge remote-tracking branch 'origin/v2' into oasis ...

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

2021-04-01 10:45:10 +02:00

..

Admin

added it_delete_user_with_all_data test

2021-03-05 10:35:30 +01:00

Auth

v1.4.1 update

2020-05-04 11:45:13 +02:00

FileBrowser

v1.4.1 update

2020-05-04 11:45:13 +02:00

FileFunctions

- cancel/resume subscription fix

2021-03-25 10:51:00 +01:00

Languages

Language editor refactoring part 1 (nackend)

2021-03-27 18:53:41 +01:00

Oasis

- favicon fix

2021-03-26 16:02:02 +01:00

Payments

v1.7 beta.1

2020-07-16 10:26:41 +02:00

PublicPages

added it_send_contact_form test

2021-03-12 16:45:02 +01:00

SetupWizard

added it_verify_purchase_code_successfully, it_verify_purchase_code_unsuccessfully, it_setup_database, it_store_stripe_credentials, it_store_stripe_billings, it_store_environment, it_store_app_settings, it_create_admin_account, it_try_to_create_admin_account_after_setup_wizard_success test

2021-03-06 10:51:03 +01:00

Share

added ShareTest test methods

2021-02-28 16:45:34 +01:00

Subscription

fixed plan description validation in payment request

2020-11-12 17:16:37 +01:00

User

- removed client passport validation

2021-03-23 15:37:21 +01:00