nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-27 18:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/version-v1.8.1'

Browse Source 
# Conflicts:
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/Others/ThumbnailItem.vue
This commit is contained in:
Peter Papp
2021-02-20 15:30:44 +01:00
parent a80e4364ae 9dbce7a73a
commit 2dbd9dd62d
26 changed files with 855 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AppFunctionsController.php
+12
View File
@@ -246,4 +246,16 @@ class AppFunctionsController extends Controller
Artisan::call('config:clear');
Artisan::call('config:cache');
}
/**
* Get Emojis List from the server
*
* @return $emojisList
*/
public function get_emojis_list()
{
$emojisList = json_decode(file_get_contents(public_path('assets/emojis.json'), true));
return collect([$emojisList]);
}
}