Merge branch 'dev' into custom_fields

app/Models/ActionLog.php

@@ -15,7 +15,7 @@ class ActionLog extends Model
     protected $fillable = [
         'type_id',
         'user_id',
-        'item_id'
+        'parameters'
     ];
 
     protected $guarded = [];

app/Models/ActionLogType.php

@@ -13,7 +13,8 @@ class ActionLogType extends Model
     public $timestamps = false;
 
     protected $fillable = [
-        'name'
+        'name',
+        'value'
     ];
 
     protected $guarded = [];

app/Models/Content.php

@@ -15,15 +15,15 @@ class Content extends Model
     protected $fillable = [
         'user_id',
         'module_handler',
+        'published_from',
+        'published_to',
         'title_photo',
         'title',
         'url',
         'meta_keywords',
         'meta_description',
-        'module_settings',
         'content',
-        'published_from',
-        'published_to',
+        'module_settings',
         'status'
     ];
 

app/Models/ContentHasCustomField.php

@@ -5,16 +5,17 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Migration
+ * Class ContentHasCustomField
  */
-class Migration extends Model
+class ContentHasCustomField extends Model
 {
 
     public $timestamps = false;
 
     protected $fillable = [
-        'migration',
-        'batch'
+        'contents_id',
+        'custom_field_id',
+        'value'
     ];
 
     protected $guarded = [];

app/Models/CustomField.php

@@ -13,8 +13,8 @@ class CustomField extends Model
     public $timestamps = false;
 
     protected $fillable = [
-        'handler',
         'name',
+        'type_id',
         'description',
         'default_value',
         'regexp',

app/Models/CustomFieldType.php

@@ -14,7 +14,7 @@ class CustomFieldType extends Model
 
     protected $fillable = [
         'name',
-        'custom_field_id'
+        'handler'
     ];
 
     protected $guarded = [];

app/Models/ModuleHasCustomField.php

@@ -14,8 +14,7 @@ class ModuleHasCustomField extends Model
 
     protected $fillable = [
         'module_handler',
-        'custom_field_id',
-        'value'
+        'custom_field_id'
     ];
 
     protected $guarded = [];

app/Models/PasswordReset.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Class PasswordReset
- */
-class PasswordReset extends Model
-{
-
-    public $timestamps = true;
-
-    protected $fillable = [
-        'email',
-        'token'
-    ];
-
-    protected $guarded = [];
-
-        
-}