yify group plans 'community coup'

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.3.9 Beta - The one with CE - 30 November 2015
+
+Bug Fixes:
+
+- Added secondary tvapi, eztv
+- fixed episode/season mixup (mitjacotic | #1)
+- Updated naming
+- Updated icons
+- various improvements
+- verified some missing dependencies we lost with .io
+- updated some ui stuff
+- changed loading help link on init to wait a bit longer
+
+new api coming soon
+
 ## 0.3.8 Beta - There's nothing on TV - 09 July 2015
 
 BugFixes: 

README.md

@@ -1,6 +1,6 @@
 # [Popcorn Time CE](https://github.com/PopcornTimeCE/popcorntimece)
 
-Allow any computer user to watch movies easily streaming from torrents, without any particular knowledge.
+Allow anyone to easily watch their favorite movies, shows, and anime.
 
 ![Popcorn Time](http://popcorntime.ml/wp-content/uploads/2015/11/poppy-ce-256.png)
 
@@ -78,6 +78,10 @@ You should have received a copy of the GNU General Public License along with thi
 
 ***
 
+**This project and the distribution of this project is not illegal, nor does it violate *any* DMCA laws. The use of this project, however, may be illegal in your area. Check your local laws and regulations regarding the use of torrents to watch potentially copyrighted content. The maintainers of this project do not condone the use of this project for anything illegal, in any state, region, country, or planet. *Please use at your own risk*.**
+
+***
+
 If you want to contact us : [hello@popcorntime.ml](mailto:hello@popcorntime.ml) or [use the form](http://popcorntime.ml/contact/) on our website.
 
-Copyright (c) 2015 Popcorn Time CE - Released under the [GPL v3 license](LICENSE.txt).
+Copyright (c) 2015 Popcorn Time CE - Released under the [GPL v3 license](LICENSE.txt).

package.json

@@ -1,23 +1,23 @@
 {
-    "name": "Popcorn-Time",
-    "homepage": "https://popcorntime.io",
-    "bugs": "https://git.popcorntime.io/popcorntime/desktop/issues",
+    "name": "Popcorn Time CE",
+    "homepage": "http://popcorntime.ml",
+    "bugs": "https://github.com/PopcornTimeCE/popcorntimece/issues",
     "repository": {
         "type": "git",
-        "url": "https://git.popcorntime.io/popcorntime/desktop.git"
+        "url": "https://github.com/PopcornTimeCE/popcorntimece.git"
     },
     "license": "GPL-3.0",
     "main": "app://host/src/app/index.html",
-    "version": "0.3.8-5",
+    "version": "0.3.9-2",
     "node-remote": "client.vpn.ht",
-"releaseName": "There's nothing on TV (0.12.2)",
+"releaseName": "The one with CE (0.3.9-2)",
     "scripts": {
         "postinstall": "node_modules/.bin/bower install --config.interactive=false && grunt setup",
         "postupdate": "node_modules/.bin/bower update --config.interactive=false && grunt setup",
         "test": "grunt --verbose"
     },
     "window": {
-        "title": "Popcorn Time",
+        "title": "Popcorn Time CE",
         "icon": "src/app/images/icon.png",
         "toolbar": false,
         "frame": false,
@@ -29,9 +29,9 @@
     },
     "dependencies": {
         "adm-zip": "0.4.7",
-        "airplay-js": "git+https://git.popcorntime.io/mirrors/node-airplay-js.git",
+        "airplay-js": "git+https://github.com/feross/node-airplay-js.git",
         "async": "0.9.0",
-        "chromecast-js": "git+https://git.popcorntime.io/mirrors/chromecast-js.git",
+        "chromecast-js": "git+https://github.com/guerrerocarlos/chromecast-js.git",
         "gitlab": "1.3.0",
         "i18n": "0.5.0",
         "iconv-lite": "^0.4.7",
@@ -45,11 +45,11 @@
         "mv": "^2.0.3",
         "nedb": "1.1.2",
         "node-captions": "0.3.8",
-        "nodecast-js": "git+https://git.popcorntime.io/mirrors/nodecast-js.git",
+        "nodecast-js": "git+https://github.com/gyzerok/nodecast-js.git",
         "node-tvdb": "1.3.1",
         "node-webkit-fdialogs": "latest",
         "os-name": "^1.0.3",
-        "peerflix": "git+https://git.popcorntime.io/mirrors/peerflix.git",
+        "peerflix": "git+https://github.com/mafintosh/peerflix.git",
         "opensubtitles-api": "^0.0.3",
         "q": "2.0.3",
         "read-torrent": "1.3.0",

src/app/lib/streamer.js

@@ -400,8 +400,8 @@
                                                 model.set('tvdb_id', res.show.tvdbid);
                                                 model.set('episode_id', res.show.episode.tvdbid);
                                                 model.set('imdb_id', res.show.imdbid);
-                                                model.set('episode', sub_data.season);
-                                                model.set('season', sub_data.episode);
+                                                model.set('episode', sub_data.episode);
+                                                model.set('season', sub_data.season);
                                                 title = res.show.title + ' - ' + i18n.__('Season %s', res.show.episode.season) + ', ' + i18n.__('Episode %s', res.show.episode.episode) + ' - ' + res.show.episode.title;
                                                 break;
                                             default:

src/app/lib/views/about.js

@@ -48,7 +48,7 @@
                     $('.changelog-text').html(contents.replace(/\n/g, '<br />'));
                     $('.changelog-overlay').show();
                 } else {
-                    gui.Shell.openExternal('https://git.popcorntime.io/popcorntime/desktop/blob/master/CHANGELOG.md');
+                    gui.Shell.openExternal('https://github.com/PopcornTimeCE/popcorntimece/blob/master/CHANGELOG.md');
                 }
             });
         },

src/app/lib/views/init_modal.js

@@ -29,7 +29,7 @@
 
             fixer = setTimeout(function () {
                 self.ui.waitingblock.show();
-            }, 7000);
+            }, 10000);
         },
 
         onDestroy: function () {

src/app/lib/views/issue.js

@@ -2,7 +2,7 @@
     'use strict';
 
     var PT_id = 13, //ID of project (got with gitlab.projects.all). 13 is for 'popcorntime/desktop'
-        PT_url = 'https://git.popcorntime.io/popcorntime/desktop/issues/', //Url of 'issues' of the above project
+        PT_url = 'https://github.com/PopcornTimeCE/popcorntimece/issues', //Url of 'issues' of the above project
         token;
 
     var Issue = Backbone.Marionette.ItemView.extend({

src/app/settings.js

@@ -96,6 +96,9 @@ Settings.vpnPassword = '';
 Settings.tvAPI = [{
     url: 'https://popcornwvnbg7jev.onion.to/',
     strictSSL: true
+}, {
+    uri: 'https://popcorntime.ws/api/eztv/',
+    strictSSL: true
 }/*, {
     url: 'https://api.popcorntime.io/',
     strictSSL: true
@@ -105,16 +108,12 @@ Settings.tvAPI = [{
 }*/];
 
 Settings.ytsAPI = [{
+    uri: 'https://yts.ag/api',
+    strictSSL: true
+}, {
     uri: 'http://api.torrentsapi.com/',
     strictSSL: false
 }/*, {
-    uri: 'https://cloudflare.com/',
-    headers: {
-        'Host': 'xor.image.yt',
-        'User-Agent': 'Mozilla/5.0 (Linux) AppleWebkit/534.30 (KHTML, like Gecko) PT/3.8.0'
-    },
-    strictSSL: true
-}, {
     uri: 'http://cloudflare.com/',
     headers: {
         'Host': 'xor.image.yt',

src/app/templates/initializing.tpl

@@ -4,7 +4,7 @@
     <%= i18n.__("Made with") %> <span style="color:#e74c3c;">&#10084;</span> <%= i18n.__("by a bunch of geeks from All Around The World") %>
 </div>
 <div class="text-begin">
-    <div class="init-text"><%= i18n.__("Initializing PopcornTime. Please Wait...") %></div>
+    <div class="init-text"><%= i18n.__("Initializing Popcorn Time CE. Please Wait...") %></div>
     <div class="init-progressbar">
         <div id="initbar-contents"></div>
     </div>