Merge pull request #2217 from popcorn-official/development

Merge dev to master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,45 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+If you are asking a question rather than filing a bug, try one of these instead:
+- Reddit /r/PopCornTime's FAQs (https://www.reddit.com/r/PopCornTime/wiki/faq)
+- Reddit /r/PopCornTime (https://www.reddit.com/r/PopCornTime/)
+- PopCornTime Forum (https://discuss.popcorntime.app/)
+-->
+
+Operating System Version:
+<!-- OS X 10.11? Windows 10? Linux?-->
+
+Popcorn Time Version:
+<!-- What version of Popcorn Time are you running? -->
+
+Download date:
+<!-- When did you install Popcorn Time? -->
+
+Download url (optional):
+<!-- Since there are pre-release builds and it's difficult to track if download is a release or just random build from jenkins. -->
+
+#### Expected Behaviour
+<!-- What did you think the app was going to do? -->
+...
+
+#### Actual Behaviour
+<!-- What does the app do instead? -->
+...
+
+#### Steps to reproduce the behaviour
+<!-- What steps do we need to take to find the same bug that you found? -->
+
+1. ...
+2. ...
+3. ...
+
+#### Screenshot(s) of issue or error(s) logs of developer console (Windows/Linux: F12, MacOS: ⌘ + 0 ... then 'console' tab) (recommended)
+<!-- Screenshot helps with finding why stuff breaks -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the idea you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/missing_content.md

@@ -0,0 +1,12 @@
+---
+name: Missing or wrong movie / episode
+about: Do not open an issue
+title: Do not open an issue
+labels: wontfix
+assignees: ''
+
+---
+
+The app don't manage the content. Results comes from third parties APIs.
+
+This is useless to open an issue here for those kind of issues.

.github/workflows/build.yml

@@ -45,18 +45,21 @@ jobs:
         if: matrix.os == 'macOS-latest'
         run: |
           yarn
+          npm install
           yarn gulp dist
 
       - name: Build App [ubuntu]
         if: matrix.os == 'ubuntu-latest'
         run: |
           yarn
+          npm install
           yarn gulp dist --platforms=linux32,linux64
 
       - name: Build App [windows]
         if: matrix.os == 'windows-latest'
         run: |
           yarn
+          npm install
           yarn gulp dist --platforms=win32
           yarn gulp dist --platforms=win64
         env:

.gitignore

@@ -23,6 +23,8 @@ lib-cov
 .idea/
 *.swp
 *.sublime-*
+.vscode/
+*.code-workspace
 *.bat
 *.db
 *.seed

.jshintrc

@@ -82,6 +82,10 @@
         "WebTorrent": true,
         "torrentCollection": true,
         "Trakt": true,
+        "pkJson": true,
+        "curSetDefaultFilters": true,
+        "extPlayerlst": true,
+        "jsonFileEditor": true,
 
         // Third party
         "Backbone": true,
@@ -90,6 +94,7 @@
         "_": true,
         "request": true,
         "videojs": true,
-        "vjs": true
+        "vjs": true,
+        "VPNht": true
     }
 }

.travis.yml

@@ -14,7 +14,7 @@ before_install:
   - yarn install --ignore-engines
   - yarn build
 install:
-  - yarn gulp compress
+  - yarn gulp prepareUpdater
 after_success:
   - ls -ltr ./build/
 deploy:
@@ -24,6 +24,7 @@ deploy:
   name: Build $(date +'%d.%m.%Y %R')
   skip_cleanup: true
   on:
+    repo: popcorn-official/popcorn-desktop
     branch: development
     tags: false
   api-key:

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.4.5 - The next wave - 21 June 2021
+
+New Features:
+- Update NWJS to 0.44.5 (https://github.com/nwjs/nw.js/blob/nw44/CHANGELOG.md)
+- Add custom servers
+- Add seedbox
+
+BigFixes:
+- Many bugs ...
+
+## 0.4.4 Beta - Love in the Time of Corona - 14 April 2020
+
+This part of the log lost in the depths of development
+
 ## 0.3.10 Beta - Popcorn Is Love - 31 October 2016
 
 BigFixes:

CONTRIBUTING.md

@@ -133,8 +133,6 @@ For translations please go to: [Transifex](https://www.transifex.com/popcorn-tim
 1. cd into the project folder
 1. Run `npm install -g grunt-cli bower` - to make it possible to run grunt commands
 
-[Complete documentation](https://github.com/popcorn-official/popcorn-desktop/tree/master/docs/Build-Debug.md)
-
 ### Updating with the latest changes
 
 Pulling down the latest changes from master will often require more than just a pull, you may also need to do one or more of the following: