Skip to content
This repository has been archived by the owner on Apr 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
bryphe committed Jan 29, 2018
2 parents 59e3894 + 9750920 commit 327aaba
Show file tree
Hide file tree
Showing 333 changed files with 13,366 additions and 5,930 deletions.
3 changes: 3 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Comment to be posted to on first time issues
newIssueWelcomeComment: >
Hello and welcome to the Oni repository! Thanks for opening your first issue here. To help us out, please make sure to include as much detail as possible - including screenshots and logs, if possible.
23 changes: 23 additions & 0 deletions .oni/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// For more information on customizing Oni,
// check out our wiki page:
// https://github.com/onivim/oni/wiki/Configuration

const activate = oni => {
console.log("Oni config activated")
}

const deactivate = () => {
console.log("Oni config deactivated")
}

module.exports = {
activate,
deactivate,
"workspace.testFileMappings": [
{
sourceFolder: "browser/src",
mappedFolder: "browser/test",
mappedFileName: "${fileName}Tests.ts",
},
],
}
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"printWidth": 100,
"semi": false,
"singleQuote": false,
"tabWidth": 4,
"trailingComma": "all"
}
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ install:
- yarn install
script:
- ./build/script/travis-build.sh
after_success:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .nyc_output/lcov.info; fi
deploy:
- provider: s3
access_key_id: AKIAIPVCKNWKWB2XULQQ
Expand Down
61 changes: 58 additions & 3 deletions BACKERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,47 @@ If you use Oni, please consider joining them via the following options:

Thanks you to all our backers for making Oni possible!

## Sponsors via OpenCollective

<h4 align="center">Gold sponsors</h4>

<a href="https://opencollective.com/oni/tiers/gold-sponsor/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/0/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/1/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/2/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/2/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/3/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/3/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/4/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/4/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/5/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/5/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/6/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/6/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/7/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/7/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/8/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/8/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/gold-sponsor/9/website" target="_blank"><img src="https://opencollective.com/oni/tiers/gold-sponsor/9/avatar.png"></a>

<h4 align="center">Silver sponsors</h4>

<a href="https://opencollective.com/oni/tiers/silver-sponsor/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/0/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/1/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/2/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/2/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/3/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/3/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/4/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/4/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/5/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/5/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/6/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/6/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/7/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/7/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/8/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/8/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/silver-sponsor/9/website" target="_blank"><img src="https://opencollective.com/oni/tiers/silver-sponsor/9/avatar.png"></a>

<h4 align="center">Bronze sponsors</h4>

<a href="https://opencollective.com/oni/tiers/bronze-sponsor/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/0/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/1/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/2/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/2/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/3/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/3/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/4/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/4/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/5/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/5/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/6/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/6/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/7/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/7/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/8/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/8/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/bronze-sponsor/9/website" target="_blank"><img src="https://opencollective.com/oni/tiers/bronze-sponsor/9/avatar.png"></a>

## VIP Backers via BountySource

- @jordwalke
Expand All @@ -28,10 +69,24 @@ Thanks you to all our backers for making Oni possible!
- @rrichardson
- @sbuljac

## Backers via OpenCollective
## Backers via PayPal

- @TalAmuyal
- @mchalkley

## Backers via OpenCollective

<a href="https://opencollective.com/oni#backers" target="_blank"><img src="https://opencollective.com/oni/backers.svg?width=890"></a>
- Tal Amuyal
- Akinola Sowemimo
- Martijn Arts
- Amadeus Folego

<a href="https://opencollective.com/oni/tiers/backer/0/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/0/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/1/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/1/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/2/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/2/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/3/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/3/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/4/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/4/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/5/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/5/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/6/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/6/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/7/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/7/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/8/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/8/avatar.png"></a>
<a href="https://opencollective.com/oni/tiers/backer/9/website" target="_blank"><img src="https://opencollective.com/oni/tiers/backer/9/avatar.png"></a>
Loading

0 comments on commit 327aaba

Please sign in to comment.