Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ethercreative/tags
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Tam committed Sep 27, 2018
2 parents 28802cc + 01fcb02 commit 9880668
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
### Fixed
- Fixed a bug when using Verbb's Control Panel Nav plugin

## 1.0.0
## 1.0.0 - 2018-08-28
### Added
- Initial release
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@
A tag manager for Craft 3

- *Create, Update, & Delete Tags*
- *Replace Tags*
- *Replace Tags*

![Tags Index](./resources/index.png)

![Edit Tag](./resources/edit.png)

![Replace Tag](./resources/replace.png)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"extra": {
"name": "Tags",
"handle": "tagManager",
"handle": "tag-manager",
"changelogUrl": "https://raw.githubusercontent.com/ethercreative/tags/master/CHANGELOG.md",
"class": "ether\\tagManager\\TagManager"
}
Expand Down
Binary file added resources/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/index.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/replace.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/tags-banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 9 additions & 10 deletions src/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9880668

Please sign in to comment.