Merge pull request #1002 from pymedusa/integration/merge-master-beta

Merge Integration/merge-master-beta into master

.build/Gruntfile.js

@@ -4,7 +4,7 @@ module.exports = function(grunt) {
     grunt.initConfig({
         clean: {
             dist: './dist/',
-            bower_components: './bower_components', // jshint ignore:line
+            bower_components: './bower_components',
             fonts: '../gui/slick/css/*.ttf',
             options: {
                 force: true
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
                 }
             }
         },
-        bower_concat: { // jshint ignore:line
+        bower_concat: {
             all: {
                 dest: {
                     js: './dist/bower.js',
@@ -122,7 +122,7 @@ module.exports = function(grunt) {
             all: [
                 '../gui/slick/js/**/*.js',
                 '!../gui/slick/js/lib/**/*.js',
-                '!../gui/slick/js/ajaxNotifications.js',
+                '!../gui/slick/js/ajax-notifications.js',
                 '!../gui/slick/js/**/*.min.js', // We use this because ignores doesn't seem to work :(
             ]
         },
@@ -153,11 +153,9 @@ module.exports = function(grunt) {
         'uglify',
         'sass',
         'cssmin',
-        'jshint',
         'mocha'
     ]);
     grunt.registerTask('travis', [
-        'jshint',
         'mocha'
     ]);
 };

.build/bower.json

@@ -25,7 +25,7 @@
     "bootstrap-formhelpers": "~2.3.0",
     "isotope": "~2.2.2",
     "openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic",
-    "jquery-backstretch": "backstretch#^2.0.4"
+    "jquery-backstretch-2": "^2.1.13"
   },
   "resolutions": {
     "bootstrap": "~3.3.5",

.gitignore

@@ -70,7 +70,8 @@ lib/unrar2/UnRAR.exe
 # Unit test/Coverage #
 ######################
 .tox/
-.coverage
+.coverage*
+.cache
 htmlcov
 
 # Contrib #

.travis.yml

@@ -1,37 +1,31 @@
 language: python
-
 python:
-  - 2.7.9
-
+- 2.7.9
 sudo: false
-
 branches:
   except:
-    - master
-
+  - master
 env:
-  - TRAVIS_NODE_VERSION="5.0.0"
-
+- TRAVIS_NODE_VERSION="5.0.0"
 before_install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
-  - npm install -g grunt-cli
-  - npm install -g bower
-  - cd .build && npm install --quiet && bower install && cd ..
-
+- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
+  && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
+  install $TRAVIS_NODE_VERSION
+- npm install -g grunt-cli
+- npm install -g bower
+- cd .build && npm install --quiet && bower install && cd ..
 install:
-    - pip install --upgrade pip
-    - pip install --upgrade tox
-
+- pip install --upgrade pip
+- pip install --upgrade tox
 script:
-  - cd .build && grunt travis && cd ..
-  - tox -v --recreate
-
+- tox -v --recreate
 cache:
   directories:
-    - $HOME/.cache/pip
-    - .build/bower_components
-    - .build/node_modules
-
+  - $HOME/.cache/pip
+  - .build/bower_components
+  - .build/node_modules
 after_failure:
-  - cat ./Logs/sickrage.log
-
+- cat ./Logs/sickrage.log
+notifications:
+  slack:
+    secure: YYOoxBgy4+iAIWylJX0ndT+KwctRzSL/8mUOPErIJOaGAwU6w9JT2WyO1uP/xq9xm+MjgGWqKJ7bpwGRJ12bCkP4mPcnn5A7c/UqFcCgwVgWfKdI/5EeHB6RfzK76J01amenN69/hzt5WjifE4wCONfJAcftKxylh69kWV5QipDcZZA//yQiO9BfYlsW3CxkHb3OGPHSJVYb32IdfCn4hnt3WaWkentXBj5R0v0kyNKbkFqQ5OGPlsjrYpxDMF8vgduxmg8zGw2tXjWGIC2bWuPoAurZy0ewyoKIna82wgkNySFjNBXoZCtssW7yPFJjUQHP/lHIZa4gLmA5Gdli7WoaN/lYaoGXlxAXSskfvgGXin92CRHukSbzEdzQznPhzxzIcuJA2je0gAvmIn2nw0itUGKbVQBZTV3nRFJb3iEHaodC0+1zozGQASxfXQzzBuHU6ZUAFWzlMNQ80RjuiS5951mmgIBo8fOfTWkVFTX8ayEfGbYhqoJqJ5QMjTjoEt8SYKrlHdlDBh803LmKOsID9B8dDn0onXlYNZAioqTTFb/xqL95aCDr84PKYbNSfraqPU6hsSc8ITtxeMS454k8BGxzed0s8bKsCDQP7HXmYKbShByMYX8NipuhtEDXeCGyCLX3atoO0qFiZ0/sUXXf67w/14eLRBAdKfnr02I=

CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing
+
+## A Guide to Contributing to Medusa
+So you think you can contribute to Medusa? We gladly have you on board! There are some pointers we'd like you give you before you start hacking into the code first. Contributions are always welcome. But if they're not using our guidelines, we can't allow that new cool feature or critical bugfix. The developers of this project have agreed on following some rules, that should improve the overall quality.
+
+## Fork-and-pull Git workflow
+In general, we follow the "fork-and-pull" Git workflow.
+1. Fork the repo on GitHub
+1. Clone the project to your own machine
+1. Push your work back up to your fork
+1. Commit changes to your own branch
+1. Submit a Pull request so that we can review your changes.
+
+**Be sure to rebase on top of the latest from "upstream" before making a pull request!**
+
+It is always possible to request a topic branch, with one if the team members. They will create one for you, which can be used instead of your local fork. The rest of the workflow will be exactly the same, with the benifit of having more users to test your code.
+
+## A multilingual application
+Medusa makes use of python, javascript, css, and html (Mako templated) code. As you might understand it is important that we follow the guidelines for each of these languages. To help you get started we provide you with some basic guidelines per language.
+
+## Python Style guidelines
+We follow the PEP8 styleguide. Please visit the official https://www.python.org/dev/peps/pep-0008/ styleguide.
+
+Additionally we follow these rules:
+
+### Logging
+After making a change to the logger module, we are able to make use of lazy logging throughout the Medusa codebase. For more on this topic please refer to: https://docs.python.org/2/library/logging.html as a starting point.
+
+Please use the following example for when adding logs.
+```python
+# At the top of the module
+import logging
+logger = logging.getLogger(__name__)
+# For each log line
+logger.info('{param1} {param2}', param1='nice', param2='catch')
+```
+### String formatting
+When you want to format a string and it's not for the purpose of a log message,
+please use the str.format() method. The following formats are allowed:
+```python
+'Did not find any results for show {0} on provider {1}'.format(show, provider)
+# or
+'Did not find any results for show {show} on provider {provider}'.format(show=show, provider=provider)
+```
+
+## Javascript guidelines
+We follow Google's Javascript guide: https://google.github.io/styleguide/javascriptguide.xml

gui/slick/css/dark.css

@@ -236,10 +236,10 @@ ul#rootDirStaticList li {
 }
 
 /* =======================================================================
-home_trendingShows.mako
+home_recommendedShows.mako
 ========================================================================== */
 
-.traktContainer {
+.recommended-container {
     margin: 12px;
     width: 188px;
     background-color: rgb(51, 51, 51);