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

Merge remote-tracking branch 'origin/bulk-operations'

Browse Source 
# Conflicts:
#	app/Http/Helpers/helpers.php
#	public/chunks/app-others.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemList.vue
#	resources/js/components/FilesView/FilePreview.vue
#	resources/js/helpers.js
#	resources/js/store/modules/fileFunctions.js
This commit is contained in:
Peter Papp
2020-12-21 17:17:10 +01:00
parent 6a9edc49c0 2c0cf43802
commit 4b3ca7e34b
9 changed files with 905 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Helpers/helpers.php
View File

@@ -355,6 +355,25 @@ function format_gigabytes($gigabytes)
}
}
/**
* Format string to formated megabytes string
*
* @param $megabytes
* @return string
*/
function format_megabytes($megabytes)
{
if ($megabytes >= 1000) {
return $megabytes / 1000 . 'GB';
}
if ($megabytes >= 1000000) {
return $megabytes / 1000000 . 'TB';
}
return $megabytes . 'MB';
}
/**
* Convert megabytes to bytes
*
@@ -530,7 +549,11 @@ function get_pretty_name($basename, $name, $mimetype)
}
/**
<<<<<<<<< Temporary merge branch 1
* Read exif data from jpeg image file
=========
* Get exif data from jpeg image
>>>>>>>>> Temporary merge branch 2
*
* @param $file
* @return array