Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add userTracking toggle #654

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6aba8e5
Add userTracking toggle
simofacc Mar 14, 2014
0f1890a
Update README.md with css dir for compass command
isra17 Mar 14, 2014
3e647f0
Added settings button
isra17 Mar 14, 2014
c94773b
Fixed hidden popular page
isra17 Mar 14, 2014
8fd45e1
Changed id of all page view to movies-list
isra17 Mar 14, 2014
3452cef
Added missing settings icon
isra17 Mar 14, 2014
d807651
Added Settings page
isra17 Mar 14, 2014
47ecd13
Added a settings page with a setting to set the download folder
isra17 Mar 14, 2014
6aeab6c
Localize new string in en and fr
isra17 Mar 14, 2014
026c10c
Aligne settings icon with fullscreen icon
isra17 Mar 14, 2014
0914885
Add option to not clear cache after movie
isra17 Mar 14, 2014
5cd15e3
Merge remote-tracking branch 'upstream/master'
simofacc Mar 14, 2014
eef2797
Add Maltese language
simofacc Mar 14, 2014
1ebafec
Torrent source is now configurable
isra17 Mar 14, 2014
7c2795a
Merge branch 'feature-settings'
isra17 Mar 14, 2014
1be8a05
Add Yts scraper
isra17 Mar 14, 2014
8e57f00
Remove broken updater
isra17 Mar 14, 2014
5d446c0
Disable tracking
isra17 Mar 14, 2014
bf2938c
Remove updater.js reference
isra17 Mar 14, 2014
307669c
Merge branch 'bugfix'
isra17 Mar 14, 2014
72909a9
Merge branch 'master' into feature-trackers
isra17 Mar 14, 2014
414322a
Add yts scraper
isra17 Mar 14, 2014
c43d596
Updated movie parsing with last beta
isra17 Mar 14, 2014
fd3189a
removing old popcorntime repository references
danielfariati Mar 14, 2014
77f3ea6
Merge pull request #2 from danielfariati/master
isra17 Mar 14, 2014
54fd7e6
Merge branch 'master' of github.com:isra17/popcorn-app
isra17 Mar 14, 2014
4519c3c
Merge branch 'feature-trackers'
isra17 Mar 14, 2014
f324731
Fix search and add support for larger images
Mar 14, 2014
788f179
Add moviedb to get metadata
isra17 Mar 14, 2014
80b694f
Add dependancy patch
isra17 Mar 14, 2014
20c7179
Merge pull request #8 from maxmcd/master
isra17 Mar 14, 2014
8eb7e13
Use new fork
simofacc Mar 14, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ To allow any computer user to watch movies easily streaming from torrents, witho
### Status

Under development (RC1) for Mac OSX - Windows - Linux.

### APIs

**Currently used:**
Expand All @@ -33,9 +33,10 @@ You will need nodejs and grunt:

### Build

Install the node modules:
Install the node modules and fix dependancies issue:

$ npm install
$ patch -p1 node_modules/moviedb/node_modules/superagent/index.js superagent-fix-node-webkit.patch

Build with:

Expand All @@ -53,18 +54,6 @@ You can also build for all platforms with:

## Any problem?

### Regarding superagent dependency
Due to [wrong browser verification](https://github.com/visionmedia/superagent/issues/95) on a dependency, this hard fix must be applied.
Replace `node_modules/moviedb/node_modules/superagent/index.js` contents with:
```javascript
// if (typeof window != 'undefined') {
// module.exports = require('./lib/superagent');
// } else if (process.env.SUPERAGENT_COV) {
// module.exports = require('./lib-cov/node');
// } else {
module.exports = require('./lib/node');
// }
```

### Regarding Video, MP4 H264 Playback
- Info: https://github.com/rogerwang/node-webkit/wiki/Support-mp3-and-h264-in-video-and-audio-tag
Expand All @@ -73,7 +62,7 @@ Replace `node_modules/moviedb/node_modules/superagent/index.js` contents with:


## Development
- Run `compass watch` in Terminal for CSS compiling and listen to future changes.
- Run `compass watch --css-dir css` in Terminal for CSS compiling and listen to future changes.
- [How to build with SublimeText](https://github.com/rogerwang/node-webkit/wiki/Debugging-with-Sublime-Text-2-and-3)
- Currently Gaze to watch all files and reload the app is disabled due to memory leaks and unstability.
- Run node-webkit from the root directory with --debug to enable debugging mode like so ```node-webkit . --debug```
Loading