Skip to content

Commit

Permalink
Merge branch 'release/1.0.6' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Feb 2, 2018
2 parents 8f8b83b + daf15b9 commit 866000b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Recipe Changelog

## 1.0.6 - 2018.02.01
### Added
* Renamed the composer package name to `craft-recipe`

## 1.0.5 - 2017.12.06
### Changed
* Updated to require craftcms/cms `^3.0.0-RC1`
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This plugin requires Craft CMS 3.0.0-RC1 or later.

To install Recipe, follow these steps:

1. Install with Composer via `composer require nystudio107/craft3-recipe`
1. Install with Composer via `composer require nystudio107/craft-recipe`
2. Install plugin in the Craft Control Panel under Settings > Plugins

Recipe works on Craft 3.x.
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "nystudio107/craft3-recipe",
"name": "nystudio107/craft-recipe",
"description": "A comprehensive recipe FieldType for Craft CMS that includes metric/imperial conversion, portion calculation, and JSON-LD microdata support",
"type": "craft-plugin",
"version": "1.0.5",
"version": "1.0.6",
"keywords": [
"craft",
"cms",
Expand All @@ -11,10 +11,10 @@
"recipe"
],
"support": {
"docs": "https://github.com/nystudio107/craft3-recipe/blob/master/README.md",
"issues": "https://github.com/nystudio107/craft3-recipe/issues"
"docs": "https://github.com/nystudio107/craft-recipe/blob/master/README.md",
"issues": "https://github.com/nystudio107/craft-recipe/issues"
},
"license": "proprietary",
"license": "MIT",
"authors": [
{
"name": "nystudio107",
Expand All @@ -35,7 +35,7 @@
"schemaVersion": "1.0.0",
"hasCpSettings": false,
"hasCpSection": false,
"changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft3-recipe/master/CHANGELOG.md",
"changelogUrl": "https://raw.githubusercontent.com/nystudio107/craft-recipe/master/CHANGELOG.md",
"class": "nystudio107\\recipe\\Recipe"
}
}
2 changes: 1 addition & 1 deletion src/templates/welcome.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% set title = 'Welcome to Recipe!' %}

{% set linkGetStarted = url('settings/fields') %}
{% set docsUrl = "https://github.com/nystudio107/craft3-recipe/blob/master/README.md" %}
{% set docsUrl = "https://github.com/nystudio107/craft-recipe/blob/master/README.md" %}

{% do view.registerAssetBundle("nystudio107\\recipe\\assetbundles\\recipe\\RecipeAsset") %}
{% set baseAssetsUrl = view.getAssetManager().getPublishedUrl('@nystudio107/recipe/assetbundles/recipe/dist', true) %}
Expand Down

0 comments on commit 866000b

Please sign in to comment.