mirror of
https://github.com/cydrobolt/polr.git
synced 2024-09-19 15:11:40 +02:00
Merge with master
This commit is contained in:
commit
d39e69e5f4
@ -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
|
||||
- Update by using `git pull` or downloading a release
|
||||
- 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
|
||||
|
||||
@ -49,7 +50,7 @@ Polr uses [Semantic Versioning](http://semver.org/)
|
||||
####License
|
||||
|
||||
|
||||
Copyright (C) 2013-2016 Chaoyi Zha
|
||||
Copyright (C) 2013-2017 Chaoyi Zha
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@ -123,7 +123,8 @@ class AdminPaginationController extends Controller {
|
||||
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);
|
||||
}
|
||||
|
||||
@ -145,7 +146,8 @@ class AdminPaginationController extends Controller {
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
@ -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'
|
||||
]);
|
||||
|
||||
|
@ -4,7 +4,7 @@
|
||||
Polr is licensed under the GPLv2+
|
||||
|
||||
<pre>
|
||||
Copyright (C) 2013-2016 Chaoyi Zha
|
||||
Copyright (C) 2013-2017 Chaoyi Zha
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@ -149,3 +149,7 @@ Example `json` error response:
|
||||
Example `plain_text` error response:
|
||||
|
||||
`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.
|
||||
|
Loading…
Reference in New Issue
Block a user