Changeset 1701ba0 for app

Timestamp:

10/27/21 09:12:02 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

e2e83fc

Parents:

33439a5 (diff), c2e9bd9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolve of merge conflict

Location:

app

Files:

• Console/Commands/clearAll.php (added)
• Console/Kernel.php (added)
• Exceptions/Handler.php (added)
• Exports/DepartmentsExport.php (added)
• Exports/FilesExport.php (added)
• Exports/FoldersExport.php (added)
• Exports/UsersExport.php (added)
• Helpers/Alert.php (added)
• Http/Controllers/Auth/CreatePasswordController.php (added)
• Http/Controllers/Auth/ForgotPasswordController.php (added)
• Http/Controllers/Auth/LoginController.php (added)
• Http/Controllers/Auth/VerifyLoginController.php (added)
• Http/Controllers/Controller.php (added)
• Http/Controllers/Dashboard/DepartmentsController.php (added)
• Http/Controllers/Dashboard/ExportExcelController.php (added)
• Http/Controllers/Dashboard/FilesController.php (added)
• Http/Controllers/Dashboard/FoldersController.php (added)
• Http/Controllers/Dashboard/IndexController.php (added)
• Http/Controllers/Dashboard/NotificationsController.php (added)
• Http/Controllers/Dashboard/SettingsController.php (added)
• Http/Controllers/Dashboard/UsersController.php (added)
• Http/Kernel.php (added)
• Http/Middleware/Authenticate.php (added)
• Http/Middleware/CheckCreatePassword.php (added)
• Http/Middleware/CheckForMaintenanceMode.php (added)
• Http/Middleware/CheckIsActive.php (added)
• Http/Middleware/CheckPermission.php (added)
• Http/Middleware/CheckVerifyNewEmail.php (added)
• Http/Middleware/CheckVerifyToken.php (added)
• Http/Middleware/EncryptCookies.php (added)
• Http/Middleware/LastSeenUserActivity.php (added)
• Http/Middleware/PreventRequestsDuringMaintenance.php (added)
• Http/Middleware/RedirectIfAuthenticated.php (added)
• Http/Middleware/TrimStrings.php (added)
• Http/Middleware/TrustHosts.php (added)
• Http/Middleware/TrustProxies.php (added)
• Http/Middleware/VerifyCsrfToken.php (added)
• Http/Requests/Auth/CreatePasswordRequest.php (added)
• Http/Requests/Auth/ForgotPasswordRequest.php (added)
• Http/Requests/Auth/LoginRequest.php (added)
• Http/Requests/Auth/VerifyNewEmailRequest.php (added)
• Http/Requests/Dashboard/EmailSettingsRequest.php (added)
• Http/Requests/Dashboard/FileNameRequest.php (added)
• Http/Requests/Dashboard/FileRequest.php (added)
• Http/Requests/Dashboard/FileTypeRequest.php (added)
• Http/Requests/Dashboard/FolderRequest.php (added)
• Http/Requests/Dashboard/NewDepartmentRequest.php (added)
• Http/Requests/Dashboard/NewUserRequest.php (added)
• Http/Requests/Dashboard/PasswordSettingsRequest.php (added)
• Http/Requests/Dashboard/UpdateDepartmentRequest.php (added)
• Http/Requests/Dashboard/UpdateUserData.php (added)
• Http/Requests/Dashboard/UpdateUserRequest.php (added)
• Http/Requests/Dashboard/UsernameSettingsRequest.php (added)
• Models/Department.php (added)
• Models/File.php (added)
• Models/FileType.php (added)
• Models/Folder.php (added)
• Models/Permission.php (added)
• Models/Role.php (added)
• Models/User.php (added)
• Notifications/ForgotPassword.php (added)
• Notifications/NewDepartmentCreated.php (added)
• Notifications/NewFileCreated.php (added)
• Notifications/NewFolderCreated.php (added)
• Notifications/VerifyUser.php (added)
• Notifications/WelcomeUser.php (added)
• Providers/AppServiceProvider.php (added)
• Providers/AuthServiceProvider.php (added)
• Providers/BroadcastServiceProvider.php (added)
• Providers/EventServiceProvider.php (added)
• Providers/RouteServiceProvider.php (added)
• Services/Hashid.php (added)
• Services/UploadService.php (added)