Skip to content

Commit

Permalink
Merge branch 'release/1.3.0' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
jalendport committed Nov 16, 2019
2 parents 12f6f56 + aae2739 commit bfb7fb7
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 25 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

## 1.3.0 - 2019-11-16

Transfer of ownership 👀

## 1.2.0 - 2018-08-02

### Added
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Luke Youell
Copyright (c) 2018 Jalen Davenport

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To install the plugin, follow these instructions.

2. Then tell Composer to load the plugin:

composer require lukeyouell/craft-fetch
composer require jalendport/craft-fetch

3. In the Control Panel, go to Settings → Plugins and click the “Install” button for Fetch.

Expand Down
18 changes: 11 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "lukeyouell/craft-fetch",
"name": "jalendport/craft-fetch",
"description": "Utilise the Guzzle HTTP client from within your Craft templates.",
"type": "craft-plugin",
"version": "1.2.0",
"version": "1.3.0",
"keywords": [
"craft",
"cms",
Expand All @@ -12,11 +12,15 @@
"fetch"
],
"support": {
"docs": "https://github.com/lukeyouell/craft-fetch/blob/v1/README.md",
"issues": "https://github.com/lukeyouell/craft-fetch/issues"
"docs": "https://github.com/jalendport/craft-fetch/blob/v1/README.md",
"issues": "https://github.com/jalendport/craft-fetch/issues"
},
"license": "MIT",
"authors": [
{
"name": "Jalen Davenport",
"homepage": "https://jalendport.com"
},
{
"name": "Luke Youell",
"homepage": "https://github.com/lukeyouell"
Expand All @@ -27,7 +31,7 @@
},
"autoload": {
"psr-4": {
"lukeyouell\\fetch\\": "src/"
"jalendport\\fetch\\": "src/"
}
},
"extra": {
Expand All @@ -36,7 +40,7 @@
"schemaVersion": "1.0.0",
"hasCpSettings": false,
"hasCpSection": false,
"changelogUrl": "https://raw.githubusercontent.com/lukeyouell/craft-fetch/v1/CHANGELOG.md",
"class": "lukeyouell\\fetch\\Fetch"
"changelogUrl": "https://raw.githubusercontent.com/jalendport/craft-fetch/v1/CHANGELOG.md",
"class": "jalendport\\fetch\\Fetch"
}
}
12 changes: 6 additions & 6 deletions src/Fetch.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*
* Utilise the Guzzle HTTP client from within your Craft templates.
*
* @link https://github.com/lukeyouell
* @copyright Copyright (c) 2018 Luke Youell
* @link https://github.com/jalendport
* @copyright Copyright (c) 2018 Jalen Davenport
*/

namespace lukeyouell\fetch;
namespace jalendport\fetch;

use lukeyouell\fetch\variables\FetchVariable;
use lukeyouell\fetch\twigextensions\FetchTwigExtension;
use jalendport\fetch\variables\FetchVariable;
use jalendport\fetch\twigextensions\FetchTwigExtension;

use Craft;
use craft\base\Plugin;
Expand All @@ -24,7 +24,7 @@
/**
* Class Fetch
*
* @author Luke Youell
* @author Jalen Davenport
* @package Fetch
* @since 1.0.0
*
Expand Down
10 changes: 5 additions & 5 deletions src/twigextensions/FetchTwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
*
* Utilise the Guzzle HTTP client from within your Craft templates.
*
* @link https://github.com/lukeyouell
* @copyright Copyright (c) 2018 Luke Youell
* @link https://github.com/jalendport
* @copyright Copyright (c) 2018 Jalen Davenport
*/

namespace lukeyouell\fetch\twigextensions;
namespace jalendport\fetch\twigextensions;

use lukeyouell\fetch\Fetch;
use jalendport\fetch\Fetch;

use Craft;

/**
* @author Luke Youell
* @author Jalen Davenport
* @package Fetch
* @since 1.1.0
*/
Expand Down
10 changes: 5 additions & 5 deletions src/variables/FetchVariable.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
*
* Utilise the Guzzle HTTP client from within your Craft templates.
*
* @link https://github.com/lukeyouell
* @copyright Copyright (c) 2018 Luke Youell
* @link https://github.com/jalendport
* @copyright Copyright (c) 2018 Jalen Davenport
*/

namespace lukeyouell\fetch\variables;
namespace jalendport\fetch\variables;

use lukeyouell\fetch\Fetch;
use jalendport\fetch\Fetch;

use Craft;

/**
* @author Luke Youell
* @author Jalen Davenport
* @package Fetch
* @since 1.0.0
*/
Expand Down

0 comments on commit bfb7fb7

Please sign in to comment.