Merge pull request #36 from someline/5.4.3@dev

5.4.3@dev
someline · Feb 20, 2017 · f3f04b1 · f3f04b1
2 parents 5c8f5ee + 6bcea98
commit f3f04b1
Show file tree

Hide file tree

Showing 28 changed files with 49,068 additions and 9,314 deletions.
diff --git a/app/Models/Traits/RelationUserTrait.php b/app/Models/Traits/RelationUserTrait.php
@@ -0,0 +1,16 @@
+<?php namespace Someline\Models\Traits;
+
+use Someline\Models\Foundation\User;
+
+trait RelationUserTrait
+{
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'user_id');
+    }
+
+}
diff --git a/package.json b/package.json
@@ -19,13 +19,16 @@
     "axios": "^0.15.2",
     "bootstrap-sass": "^3.3.7",
     "jquery": "^3.1.0",
-    "laravel-mix": "^0.7.4",
+    "laravel-mix": "^0.8.0",
     "lodash": "^4.16.2",
     "vue": "^2.1.10"
   },
   "dependencies": {
     "autosize": "^3.0.20",
+    "babel-polyfill": "^6.23.0",
+    "es6-shim": "^0.35.3",
     "moment": "^2.17.1",
+    "promise.prototype.finally": "^2.0.1",
     "vue-i18n": "^5.0.0",
     "vue-router": "^2.2.0",
     "vuex": "^2.1.2"

diff --git a/public/assets/css/app.theme.2cf7e7786b057f65ae67cf8102f17ee5.css b/public/assets/css/app.theme.2cf7e7786b057f65ae67cf8102f17ee5.css
diff --git a/public/assets/css/app.theme.85bcc6d4ef83fcdb8d9df1b4a2c2f7a1.css b/public/assets/css/app.theme.85bcc6d4ef83fcdb8d9df1b4a2c2f7a1.css