Alex/polr
1
0
Fork 0
mirror of https://github.com/cydrobolt/polr.git synced 2024-11-09 19:52:28 +01:00
Code Issues Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Chaoyi Zha 2017-01-26 16:00:06 -05:00
commit d39e69e5f4
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -36,6 +36,7 @@ There are breaking changes between 2.x and 1.x; it is not yet possible to automa
- Back up your database and files - Back up your database and files
- Update by using `git pull` or downloading a release - Update by using `git pull` or downloading a release
- Run `composer install -no-dev -o` to ensure dependencies are up to date - Run `composer install -no-dev -o` to ensure dependencies are up to date
- Migrate with `php artisan migrate` to ensure database structure is up to date
#### Browser Extensions #### Browser Extensions
@ -49,7 +50,7 @@ Polr uses [Semantic Versioning](http://semver.org/)
####License ####License
Copyright (C) 2013-2016 Chaoyi Zha Copyright (C) 2013-2017 Chaoyi Zha
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

6
app/Http/Controllers/AdminPaginationController.php
View File

@ -123,7 +123,8 @@ class AdminPaginationController extends Controller {
return $link->clicks; return $link->clicks;
} }
}) })
->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); ->make(true);
} }
@ -145,7 +146,8 @@ class AdminPaginationController extends Controller {
return $link->clicks; return $link->clicks;
} }
}) })
->escapeColumns(['short_url', 'long_url']) ->editColumn('long_url', '<a target="_blank" title="{{ $long_url }}" href="{{ $long_url }}">{{ str_limit($long_url, 50) }}</a>')
->escapeColumns(['short_url'])
->make(true); ->make(true);
} }
} }

2
app/Http/Controllers/Api/ApiLinkController.php
View File

@ -43,7 +43,7 @@ class ApiLinkController extends ApiController {
$user = self::getApiUserInfo($request); $user = self::getApiUserInfo($request);
// Validate URL form data // Validate URL form data
$validator = Validator::make($request, [ $validator = \Validator::make($request, [
'url_ending' => 'required|alpha_dash' 'url_ending' => 'required|alpha_dash'
]); ]);

2
docs/about/license.md
View File

@ -4,7 +4,7 @@
Polr is licensed under the GPLv2+ Polr is licensed under the GPLv2+
<pre> <pre>
Copyright (C) 2013-2016 Chaoyi Zha Copyright (C) 2013-2017 Chaoyi Zha
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License

4
docs/developer-guide/api.md
View File

@ -149,3 +149,7 @@ Example `json` error response:
Example `plain_text` error response: Example `plain_text` error response:
`custom ending already in use` `custom ending already in use`
## Testing the API
You may test your integrations on http://demo.polr.me with the credentials "demo-admin"/"demo-admin". Keep in mind the instance is only a demo and may be cleared at any time.