Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
shinebayar-g committed Aug 15, 2019
2 parents 5fe7a63 + c99c370 commit fb5c07b
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 10 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'type: bug'
assignees: ''

---

<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
If the matter is security related, please disclose it privately via info@erxes.io
-->

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Context (please include the related information if applicable):**
- OS: [e.g. Ubuntu 16.04]
- Browser version [e.g. chrome 75.0.3770.142 safari 12.1.1]
- erxes version [e.g. 0.9.17, 0.9.16]
- installation type [e.g docker, manual]

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Enhancement request
about: Suggest an enhancement to the erxes project
title: ''
labels: 'type: enhancement'
assignees: ''

---

**Is your enhancement request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the enhancement request here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'type: feature'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Additional context**
Add any other context or screenshots about the feature request here.
15 changes: 7 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
## [0.9.17](https://github.com/erxes/erxes-widgets-api/compare/0.9.16...0.9.17) (2019-07-09)
# [0.10.0](https://github.com/erxes/erxes-widgets-api/compare/0.9.17...0.10.0) (2019-08-15)


### Features
### Bug Fixes

* **deal/ticket/task:** Add watch option for deal, ticket, task and pipeline ([1956ec1](https://github.com/erxes/erxes-widgets-api/commit/1956ec1)), closes [erxes/erxes#1013](https://github.com/erxes/erxes/issues/1013)
* **docker:** fix dockerfile permission error ([3815953](https://github.com/erxes/erxes-widgets-api/commit/3815953))

## [0.9.16](https://github.com/erxes/erxes-widgets-api/compare/0.9.15...0.9.16) (2019-07-03)
## [0.9.17](https://github.com/erxes/erxes-widgets-api/compare/0.9.16...0.9.17) (2019-07-09)


### Bug Fixes
### Features

* **drone:** workaround for wrong version information showing on version.json ([c99e3c1](https://github.com/erxes/erxes-widgets-api/commit/c99e3c1))
* **deal/ticket/task:** Add watch option for deal, ticket, task and pipeline ([1956ec1](https://github.com/erxes/erxes-widgets-api/commit/1956ec1)), closes [erxes/erxes#1013](https://github.com/erxes/erxes/issues/1013)

## [0.9.16](https://github.com/erxes/erxes-widgets-api/compare/0.9.13...0.9.16) (2019-07-03)
## [0.9.16](https://github.com/erxes/erxes-widgets-api/compare/0.9.15...0.9.16) (2019-07-03)


### Bug Fixes

* **drone:** workaround for wrong version information showing on version.json ([c99e3c1](https://github.com/erxes/erxes-widgets-api/commit/c99e3c1))

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

erxes is an open source growth marketing platform. Marketing, sales, and customer service platform designed to help your business attract more engaged customers. Replace Hubspot with the mission and community-driven ecosystem.

<a href="https://demohome.erxes.io/">View demo</a> <b>| </b> <a href="https://github.com/erxes/erxes-widgets-api/archive/master.zip">Download ZIP </a> <b> | </b> <a href="https://erxes.slack.com">Join us on Slack</a>
<a href="https://demohome.erxes.io/">View demo</a> <b>| </b> <a href="https://github.com/erxes/erxes-widgets-api/archive/master.zip">Download ZIP </a> <b> | </b> <a href="https://slack.erxes.io">Join us on Slack</a>

## Status <br>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "erxes-widgets-api",
"version": "0.9.17",
"version": "0.10.0",
"description": "GraphQL API for erxes widgets",
"homepage": "https://erxes.io",
"repository": {
Expand Down

0 comments on commit fb5c07b

Please sign in to comment.