From 0e1420ba21e8e72f74db2a8e95f5a04609bb4dd5 Mon Sep 17 00:00:00 2001
From: overint <emcmahonzx@gmail.com>
Date: Mon, 19 Dec 2016 22:00:29 +1100
Subject: Truncate long URLs on admin dash.

---
 app/Http/Controllers/AdminPaginationController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/Http')

diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php
index 9add38d..1dfd0e3 100644
--- a/app/Http/Controllers/AdminPaginationController.php
+++ b/app/Http/Controllers/AdminPaginationController.php
@@ -113,7 +113,8 @@ class AdminPaginationController extends Controller {
                     Delete
                 </a>';
             })
-            ->escapeColumns(['short_url', 'long_url', 'creator'])
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50)}}</a>')
+            ->escapeColumns(['short_url', 'creator'])
             ->make(true);
     }
 
@@ -125,7 +126,8 @@ class AdminPaginationController extends Controller {
             ->select(['short_url', 'long_url', 'clicks', 'created_at']);
 
         return Datatables::of($user_links)
-            ->escapeColumns()
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50)}}</a>')
+            ->escapeColumns(['short_url'])
             ->make(true);
     }
 }
-- 
cgit v1.2.3


From e829169ef83174f8d948e3ab514a1f2743b8d9d9 Mon Sep 17 00:00:00 2001
From: Chaoyi Zha <summermontreal@gmail.com>
Date: Thu, 29 Dec 2016 14:59:58 -0500
Subject: Fix spacing

---
 app/Http/Controllers/AdminPaginationController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Http')

diff --git a/app/Http/Controllers/AdminPaginationController.php b/app/Http/Controllers/AdminPaginationController.php
index 1dfd0e3..afa3df2 100644
--- a/app/Http/Controllers/AdminPaginationController.php
+++ b/app/Http/Controllers/AdminPaginationController.php
@@ -113,7 +113,7 @@ class AdminPaginationController extends Controller {
                     Delete
                 </a>';
             })
-            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50)}}</a>')
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50) }}</a>')
             ->escapeColumns(['short_url', 'creator'])
             ->make(true);
     }
@@ -126,7 +126,7 @@ class AdminPaginationController extends Controller {
             ->select(['short_url', 'long_url', 'clicks', 'created_at']);
 
         return Datatables::of($user_links)
-            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50)}}</a>')
+            ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50) }}</a>')
             ->escapeColumns(['short_url'])
             ->make(true);
     }
-- 
cgit v1.2.3


From 4670270240ff3c6604e98a4f5f017a85089bb223 Mon Sep 17 00:00:00 2001
From: Chaoyi Zha <summermontreal@gmail.com>
Date: Sat, 21 Jan 2017 11:23:45 -0500
Subject: Use Validator from the global namespace fix #278

---
 app/Http/Controllers/Api/ApiLinkController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Http')

diff --git a/app/Http/Controllers/Api/ApiLinkController.php b/app/Http/Controllers/Api/ApiLinkController.php
index 30f007a..e6449b1 100644
--- a/app/Http/Controllers/Api/ApiLinkController.php
+++ b/app/Http/Controllers/Api/ApiLinkController.php
@@ -43,7 +43,7 @@ class ApiLinkController extends ApiController {
         $user = self::getApiUserInfo($request);
 
         // Validate URL form data
-        $validator = Validator::make($request, [
+        $validator = \Validator::make($request, [
             'url_ending' => 'required|alpha_dash'
         ]);
 
-- 
cgit v1.2.3