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.php

Language editor refactoring part 3 (backend + frontend)

2021-04-01 07:50:01 +02:00

api.php

cleaning

2021-03-27 12:21:35 +01:00

channels.php

Initial commit

2020-03-10 19:00:32 +01:00

console.php

Initial commit

2020-03-10 19:00:32 +01:00

file.php

- public sharing refactored part 1

2021-03-19 07:27:15 +01:00

maintenance.php

divisive public and private browsing controller

2021-03-14 17:03:42 +01:00

oasis.php

- redirect after sign in/up to payment page

2021-03-24 11:38:15 +01:00

setup.php

divisive public and private browsing controller

2021-03-14 17:03:42 +01:00

share.php

- public sharing refactored part 3

2021-03-19 10:13:48 +01:00

user.php

- extend setup:dev script

2021-03-24 08:42:10 +01:00

web.php

Language editor refactoring part 2 (backend + frontend)

2021-03-28 14:06:16 +02:00