Skip to content

Commit

Permalink
Merge pull request #1208 from JoinColony/maint/text-files
Browse files Browse the repository at this point in the history
Update text files
  • Loading branch information
area authored Jan 29, 2024
2 parents 28a6c34 + 039e849 commit 2742a7c
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ The focus currently is implementing the [Colony White Paper](https://colony.io/w

Specifically we need help with the [Colony Contribute Backlog](https://github.com/JoinColony/colonyNetwork/projects/2). Items suitable for external contributors are labelled "good for collaborators".

When making a larger change, please consult with the team on [Colony Network Gitter channel](http://gitter.im/JoinColony/colonyNetwork).

## How to report issues

To report an issue, use the [GitHub issues tracker](https://github.com/JoinColony/colonyNetwork/issues).
Expand Down
9 changes: 3 additions & 6 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# Prerequisites
Please answer the following questions for yourself before submitting an issue. **YOU MAY DELETE THE PREREQUISITES SECTION.**

- [ ] I checked to make sure that this issue has not already been filed
- [ ] I've asked for help in the [Colony Network Gitter](http://gitter.im/JoinColony/colonyNetwork) before filing this issue.
# Prerequisite
Please make sure that this issue has not already been filed.

## Summary
<!--- Concise overview of the issue. -->
Expand Down Expand Up @@ -30,4 +27,4 @@ Please answer the following questions for yourself before submitting an issue. *
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Operating System:
* Ethereum client:
* solc version:
* solc version:
2 changes: 0 additions & 2 deletions docs/.templates/votingreputation.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Motions & Disputes Extension (`VotingReputation`)

This extension allows any member of your colony to propose a Motion to take an Action that will pass after a security delay unless somebody Objects. This applies to all Actions, such as creating an expenditure, managing funds, or managing teams.

See [here](https://colony.gitbook.io/colony/extensions/governance) for more information.
4 changes: 2 additions & 2 deletions docs/bug-bounty.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ The Bug Bounty Program is not open to any of the following persons (“Ineligibl

We may modify the terms of this program or terminate this program at any time. We won’t apply any changes we make to these program terms retroactively.

All conditions specified in the [general terms agreement of colony.io](https://xdai.colony.io/terms-and-services) apply to this program.
All conditions specified in the general terms agreement of colony.io apply to this program.

### 1. Definitions

Expand All @@ -137,7 +137,7 @@ A disclosure of any software flaw or attack vector submitted to the bug bounty p

### 1.4 "Colony"

This program is sponsored by Collectively Intelligent Ltd (3 Butler House, 49-51 Curtain Road, London, United Kingdom EC2A 3PT ("Colony"). Colony is responsible for any website hosting, marketing, bug report assessment, prize disbursement, and any other activities not listed here related to the Bug Bounty Program.
This program is sponsored by Metacolony Inc. ("Colony"). Colony is responsible for any website hosting, marketing, bug report assessment, prize disbursement, and any other activities not listed here related to the Bug Bounty Program.

### 1.7 "Submitter", or "Participant"

Expand Down
2 changes: 0 additions & 2 deletions docs/concepts/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,3 @@ Requires different permissions depending on usage, as the extension must be able
## Whitelist

Alongside the Coin Machine Extension, a colony may use the Whitelist extension to filter wallet addresses allowed to take part in a token sale on Coin Machine.

See [here](https://colony.gitbook.io/colony/extensions/whitelist) for more information.
2 changes: 0 additions & 2 deletions docs/interfaces/extensions/votingreputation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

This extension allows any member of your colony to propose a Motion to take an Action that will pass after a security delay unless somebody Objects. This applies to all Actions, such as creating an expenditure, managing funds, or managing teams.

See [here](https://colony.gitbook.io/colony/extensions/governance) for more information.


## Interface Methods

Expand Down

0 comments on commit 2742a7c

Please sign in to comment.