diff --git a/.gitignore b/.gitignore index 8b0670a5..5e756ab4 100644 --- a/.gitignore +++ b/.gitignore @@ -75,6 +75,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +dist/ # Visual Studio 2015 cache/options directory .vs/ diff --git a/.jsbeautifyrc b/.jsbeautifyrc index 003475e2..cb85fa80 100644 --- a/.jsbeautifyrc +++ b/.jsbeautifyrc @@ -8,7 +8,7 @@ "indent_with_tabs": false, "indent_size": 4, "indent_char": " ", - "jslint_happy": true, + "jslint_happy": false, "keep_array_indentation": false, "keep_function_indentation": false, "max_preserve_newlines": 3, diff --git a/.jshintrc b/.jshintrc index e55403bc..432e6aed 100644 --- a/.jshintrc +++ b/.jshintrc @@ -21,7 +21,6 @@ "quotmark" : "single", "trailing" : true, "sub" : true, - "trailing" : true, "undef" : true, "laxbreak" : true, "loopfunc" : true, @@ -85,8 +84,6 @@ // Third party "Backbone": true, "Mousetrap": true, - "_": true, - "request": true, "videojs": true, "vjs": true } diff --git a/.vscode/settings.json b/.vscode/settings.json index 40360063..392fb975 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ // Place your settings in this file to overwrite default and user settings. { - "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true, + // Defines space handling after function keyword for anonymous functions + "javascript.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": false, "eslint.enable": false, "jshint.enable": false } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eb524fe..cf56d2c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## 0.4.1-15 Beta - Ides of March - 11 March 2018 + +BugFixes: +- Bookmark and Seen button visual issue fixed for both Movie and TV Show +- Fixed icon location in Themes for About screen +- Fixed About and minor Theme issues +- Remove tvApiServer copy from appearing incorrectly +- Genre will default to 'N/A' when it can't be determined +- Removed text referencing yts.ph +- Streamer: Increased Buffer Stream +- Webtorrent: Display torrent warning in the console + +Updated: +- Updated various packages +- Updated analytics calls + ## 0.4.1-14 Beta - Lets start the New Year right... - 26 December 2017 New Features: diff --git a/install b/install index 5f4dca58..eeab5f01 100755 --- a/install +++ b/install @@ -23,7 +23,7 @@ fi func_error #Variables -version="0.4.1-14" +version="0.4.1-15" tos="http://popcorn-time.is/tos.html" $path="$HOME/.Popcorn-Time-CE" diff --git a/package.json b/package.json index a201ae40..ae631b4a 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ }, "license": "GPL-3.0", "main": "src/app/index.html", - "version": "0.4.1-14", + "version": "0.4.1-15", "node-remote": "*://*", - "releaseName": "Lets start the New Year right...", + "releaseName": "Ides of March", "scripts": { "start": "gulp run" }, @@ -48,7 +48,7 @@ "mv": "^2.0.3", "nedb": "1.8.0", "node-captions": "0.4.6", - "node-tvdb": "^3.1.1", + "node-tvdb": "^4.0.0", "node-webkit-fdialogs": "^0.2.7", "nodecast-js": "^1.0.3", "opensubtitles-ce": "^1.0.0", @@ -64,7 +64,7 @@ "semver": "^5.3.0", "send": "^0.16.1", "strike-api": "0.2.0", - "tar": "^4.1.1", + "tar": "^4.3.3", "temp": "^0.8.1", "torrent-tracker-health": "git+https://github.com/PTCE-Public/torrent-tracker-health.git", "underscore": "^1.8.3", @@ -77,12 +77,12 @@ "eslint": "^4.13.1", "eslint-config-google": "^0.9.1", "gulp": "^3.9.1", - "gulp-zip": "~4.0.0", + "gulp-zip": "~4.1.0", "gulp-gzip":"^1.4.0", "gulp-tar": "^2.0.0", "nw-builder": "^3.5.1", "nw-gyp": "^3.4.0", - "yargs": "^10.0.3" + "yargs": "^11.0.0" }, "description": "", "author": "" diff --git a/src/app/index.html b/src/app/index.html index b9851f49..8bd4c221 100644 --- a/src/app/index.html +++ b/src/app/index.html @@ -2,6 +2,25 @@ + + + + @@ -11,6 +30,12 @@ + + + + +
@@ -155,7 +180,7 @@