FEATURE #1508: merge files and directories overview.

This commit merges list of all uploaded files and created directories into one page. It also modifies way of uploading files. Special page for uploading files was removed (because of no support for directories) and files can be uploaded only via overview.

app/Models/File.php

@@ -101,9 +101,10 @@ class File extends Model
         $newFile->hash_algorithm = self::HASH_ALGORITHM;
         $newFile->mime_type = $file->getMimeType();
         $newFile->file_size = $file->getSize();
+        $newFile->directory_id = $request->directoryId;
 
         // save optional fields
-        $optionalFields = ['description', 'keywords', 'directory'];
+        $optionalFields = ['description', 'keywords'];
         foreach ($optionalFields as $field) {
             if ($request->has($field)) {
                 $newFile->$field = $request->$field;