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
..
AlbumController.php	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
DefaultController.php	#132: Added support for using vhosts with RabbitMQ	2019-08-11 07:49:25 +01:00
GroupController.php	#4: It's now possible to delete single comments and bulk-delete multiple comments in the admin screen	2018-10-05 22:17:41 +01:00
LabelController.php	#29: Corrected permission check when displaying photos linked to a label. Multiple instances of a new label are no longer duplicated (separated out the creation logic into the LabelController.)	2017-09-10 12:40:24 +01:00
PhotoCommentController.php	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
PhotoController.php	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
StatisticsController.php	#3: Merged the two photo charts into one and added a "number at-a-glance" widget on the statistics page	2017-09-10 17:02:15 +01:00
StorageController.php	Merge branch 'master' into feature/106-dropbox-storage	2020-04-18 21:53:36 +01:00
UserController.php	Enable users public profile page by default when profile pages are enabled	2019-07-28 08:17:17 +01:00