Andy Heathershaw fdf4d72236 Merge branch 'master' into feature/106-dropbox-storage ... # Conflicts: # app/Http/Controllers/Admin/StorageController.php # resources/views/themes/base/admin/edit_storage.blade.php		2020-04-18 21:53:36 +01:00
..
admin	Merge branch 'master' into feature/106-dropbox-storage	2020-04-18 21:53:36 +01:00
auth	Upgraded Laravel from 5.5 to 6.0 LTS, as well as latest Composer dependencies #142	2020-04-18 17:45:40 +01:00
email	#123: The framework of sending e-mails using Mailables but queued in the database is now there. Password reset e-mails are now the first ones being sent using the queue.	2019-07-14 12:13:58 +01:00
gallery	Updated all resource routes to follow Laravel's standard of the "id" parameter on edit/update/destroy routes being the singular of the resource #142	2020-04-18 18:25:43 +01:00
partials	Merge branch 'master' into feature/106-dropbox-storage	2020-04-18 21:53:36 +01:00
email_layout.blade.php	Finished the test e-mail settings functionality and introduced TLS encryption. Tested with Office 365.	2016-09-06 13:26:02 +01:00
layout.blade.php	#19: Added a check for the user.enable_profile_page column when viewing the profile page. Added link to user's profile page (if enabled) in album footers. Tooltips are now enabled globally. Child album's footer now shows the details as tooltips.	2018-08-11 09:20:40 +01:00