Skip to content

Commit

Permalink
Merge pull request #6 from trailofbits/master
Browse files Browse the repository at this point in the history
  • Loading branch information
fengjixuchui committed May 19, 2020
2 parents 2684834 + 24161e4 commit c6ac14e
Show file tree
Hide file tree
Showing 25 changed files with 504 additions and 297 deletions.
20 changes: 13 additions & 7 deletions .github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
### OS / Environment
<!--- lsb_release -a --->
---
name: Bug report
about: Create a report to help us improve Manticore
title: ''
labels: bug
assignees: ''

---

### Summary of the problem


### Manticore version
<!--- pip show manticore | grep Version --->

### Python version
<!--- python --version --->

### OS / Environment
<!--- lsb_release -a --->

### Dependencies
<!--- pip freeze --->


### Summary of the problem


### Step to reproduce the behavior


Expand All @@ -27,4 +34,3 @@
### Any relevant logs



14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
blank_issues_enabled: false
contact_links:
- name: Bug Report
url: https://github.com/trailofbits/manticore/issues/new?labels=bug&template=bug_report.md
about: Report a bug in Manticore
- name: Feature Request
url: https://github.com/trailofbits/manticore/issues/new?labels=idea&template=feature_request.md
about: Request a new feature in Manticore
- name: Ask a Question
url: https://github.com/trailofbits/manticore/discussions/new
about: Ask for help or clarification from the developers
- name: Join our Slack
url: https://empirehacking.slack.com/archives/C3PTWK7UM
about: Engage with other users of Manticore
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest a new feature for Manticore
title: ''
labels: idea
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.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
6 changes: 5 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ instead.

## Questions

Questions can be submitted to the issue tracker, but you may get a faster
Questions can be submitted to the [discussion page](https://github.com/trailofbits/manticore/discussions), but you may get a faster
response if you ask in our [chat room](https://empireslacking.herokuapp.com/)
(in the #manticore channel).

## Legal
For legal reasons, we require contributors to sign our [Contributor License Agreement](https://cla-assistant.io/trailofbits/manticore).
This will be automatically checked as part of our CI.

## Code

Manticore uses the pull request contribution model. Please make an account on
Expand Down
Loading

0 comments on commit c6ac14e

Please sign in to comment.