Skip to content

Commit

Permalink
butterize
Browse files Browse the repository at this point in the history
  • Loading branch information
Some Popcorn Time Contributor authored and xaiki committed Oct 22, 2015
1 parent 173766a commit 589c610
Show file tree
Hide file tree
Showing 53 changed files with 474 additions and 813 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.4.0 Alpha - Adding a bit of Butter - 19 October 2015

- Split from the popcorntime.io project.
- Remove all providers but vodo.
- open butterproject on github

## 0.3.8 Beta - There's nothing on TV - 09 July 2015

BugFixes:
Expand Down Expand Up @@ -285,4 +291,4 @@ release notes:
- Rotten-Tomato
- Yify Subtitles
- Manual input torrent / subtitles files
- Multi-language App support
- Multi-language App support
40 changes: 20 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to Popcorn Time
# Contributing to Butter

So you're interested in giving us a hand? That's awesome! We've put together some brief guidelines that should help
you get started quickly and easily.
Expand All @@ -9,14 +9,14 @@ There are lots and lots of ways to get involved, this document covers:
* [bug reports](#bug-reports)
* [feature requests](#feature-requests)
* [change requests](#change-requests)
* [working on Popcorn Time core](#core)
* [working on Butter core](#core)
* [submitting pull requests](#submitting-pull-requests)
* [translation](#translation)


## Report a bug

If you're about to raise an issue because think you've found a problem with Popcorn Time, or you'd like to make a request
If you're about to raise an issue because think you've found a problem with Butter, or you'd like to make a request
for a new feature in the codebase, or any other reason… please read this first.

The GitLab issue tracker is the preferred channel for [bug reports](#bug-reports),
Expand All @@ -27,7 +27,7 @@ requests](#submitting-pull-requests), but please respect the following restricti
has already reported your problem or requested your idea.

* Please **do not** use the issue tracker for personal support requests (use
[the forum](http://discuss.popcorntime.io) or IRC - #popcorntime on freenode).
[the github issues](http://github.com/butterproject/butter/issues) or IRC - #butterproject on freenode).

* Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.

Expand All @@ -40,7 +40,7 @@ Guidelines for bug reports:

1. **Use the GitLab issue search** — check if the issue has already been reported.

2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or look for [closed issues](../../../../popcorntime/desktop/issues?state=closed).
2. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or look for [closed issues](../../../../butter/desktop/issues?state=closed).

3. **Include a screencast if relevant** - Is your issue about a design or front end feature or bug? The most helpful thing in the world is if we can *see* what you're talking about.
Use [LICEcap](http://www.cockos.com/licecap/) to quickly and easily record a short screencast (24fps) and save it as an animated gif! Embed it directly into your Gitlab issue. Kapow.
Expand Down Expand Up @@ -68,8 +68,8 @@ Any other information you want to share that is relevant to the issue being repo
### Technical details:
* Popcorn Time Version: stable 0.3.7
* Downloaded from: popcorntime.io
* Butter Version: stable 0.3.7
* Downloaded from: butterproject.org
* Connection: 10mbs
* OS: MAC OSX
```
Expand All @@ -78,8 +78,8 @@ Any other information you want to share that is relevant to the issue being repo

Feature requests are welcome. Before you submit one be sure to have:

1. Read the [Roadmap](../../../../popcorntime/desktop/wikis/roadmap) and
[Planned Features](../../../../popcorntime/desktop/wikis/planned) listing, **use the Jira search** and check the feature hasn't already been requested.
1. Read the [Roadmap](../../../../butter/desktop/wikis/roadmap) and
[Planned Features](../../../../butter/desktop/wikis/planned) listing, **use the Jira search** and check the feature hasn't already been requested.
2. Take a moment to think about whether your idea fits with the scope and aims of the project, or if it might
better fit being an app/plugin.
3. Remember, it's up to *you* to make a strong case to convince the project's leaders of the merits of this
Expand All @@ -90,7 +90,7 @@ likely to be common.

### Change Requests

Change requests cover both architectural and functional changes to how Popcorn Time works. If you have an idea for a
Change requests cover both architectural and functional changes to how Butter works. If you have an idea for a
new or different dependency, a refactor, or an improvement to a feature, etc - please be sure to:

1. **Use the GitLab search** and check someone else didn't get there first
Expand All @@ -105,23 +105,23 @@ what's already there? Does it fit with the Roadmap?
Pull requests are awesome. If you're looking to raise a PR for something which doesn't have an open issue, please think carefully about [raising an issue](#report-a-bug) which your PR can close, especially if you're fixing a bug. This makes it more likely that there will be enough information available for your PR to be properly tested and merged. To make sure your PR is accepted as quickly as possible, you should be sure to have read
all the guidelines on:

* [code standards](../../../../popcorntime/desktop/wikis/code-standards)
* [commit messages](../../../../popcorntime/desktop/wikis/git-workflow#commit-messages)
* [cleaning-up history](../../../../popcorntime/desktop/wikis/git-workflow#clean-up-history)
* [not breaking the build](../../../../popcorntime/desktop/wikis/git-workflow#check-it-passes-the-tests)
* [code standards](../../../../butter/desktop/wikis/code-standards)
* [commit messages](../../../../butter/desktop/wikis/git-workflow#commit-messages)
* [cleaning-up history](../../../../butter/desktop/wikis/git-workflow#clean-up-history)
* [not breaking the build](../../../../butter/desktop/wikis/git-workflow#check-it-passes-the-tests)

##### Need Help?

If you're not completely clear on how to submit / update / *do* Pull Requests, please check out our in depth
[Git Workflow guide](../../../../popcorntime/desktop/wikis/git-workflow) for Popcorn Time.
[Git Workflow guide](../../../../butter/desktop/wikis/git-workflow) for Butter.


### Translation

For translations please go to: [Transifex](https://www.transifex.com/projects/p/popcorn-time-app)
For translations please go to: [Transifex](https://www.transifex.com/projects/p/butter-app)


## Working on Popcorn Time Core
## Working on Butter Core

**Pre-requisites:**

Expand All @@ -134,7 +134,7 @@ For translations please go to: [Transifex](https://www.transifex.com/projects/p/
1. cd into the project folder
1. Run `npm install -g grunt-cli bower` - to make it possible to run grunt commands

[complete documentation](../../../../popcorntime/desktop/wikis/build-debug).
[complete documentation](../../../../butter/desktop/wikis/build-debug).

### Updating with the latest changes

Expand All @@ -146,7 +146,7 @@ Pulling down the latest changes from master will often require more than just a

## Contributor License Agreement

By contributing your code to Popcorn Time you grant the Popcorn Time Foundation a non-exclusive, irrevocable, worldwide,
By contributing your code to Butter you grant the Butter Project a non-exclusive, irrevocable, worldwide,
royalty-free, sublicenseable, transferable license under all of Your relevant intellectual property rights
(including copyright, patent, and any other rights), to use, copy, prepare derivative works of, distribute and
publicly perform and display the Contributions on any licensing terms, including without limitation:
Expand All @@ -163,7 +163,7 @@ claims, or has the right to claim, any right in any invention or patent related
represent that You are not legally obligated, whether by entering into an agreement or otherwise, in any way that
conflicts with the terms of this license.

The Popcorn Time Foundation acknowledges that, except as explicitly described in this Agreement, any Contribution which
The Butter Project acknowledges that, except as explicitly described in this Agreement, any Contribution which
you provide is on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS
FOR A PARTICULAR PURPOSE.
Loading

0 comments on commit 589c610

Please sign in to comment.