Merged branch dev into master

mistic100 · Oct 23, 2016 · 6d9f1aa · 6d9f1aa
2 parents 5eedbd3 + d680c92
commit 6d9f1aa
Show file tree

Hide file tree

Showing 22 changed files with 413 additions and 123 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -3,9 +3,6 @@
 ## Work on `dev`
 Any merge request should be created from and issued to the `dev` branch.
 
-## dist files
-Keep it simple, don't commit any files in the `dist` directory, I build these files only before a release.
-
 ## Unit tests
 There are very few unit tests because it's somehow difficult to setup, but please don't break them and create new ones if you can.
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,5 +2,4 @@
 
 - [ ] I read the [guidelines for contributing](https://github.com/mistic100/Photo-Sphere-Viewer/blob/master/.github/CONTRIBUTING.md)
 - [ ] I created my branch from `dev` and I am issuing the PR to `dev`
-- [ ] I **didn't** commited files in the `dist` directory
 - [ ] Unit tests are OK
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ node_js:
   - "5"
 before_install:
   - gem install sass
-  - gem install scss_lint
+  - gem install scss_lint -v 0.49.0
   - npm install -g grunt-cli
   - npm install -g bower
 before_script:

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -183,6 +183,7 @@ module.exports = function(grunt) {
     connect: {
       dev: {
         options: {
+          host: '0.0.0.0',
           port: 9000
         }
       }

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Photo Sphere Viewer
 
 [![Bower version](https://img.shields.io/bower/v/Photo-Sphere-Viewer.svg?style=flat-square)](http://photo-sphere-viewer.js.org)
+[![NPM version](https://img.shields.io/npm/v/photo-sphere-viewer.svg?style=flat-square)](https://www.npmjs.com/package/photo-sphere-viewer)
 [![Build Status](https://img.shields.io/travis/mistic100/Photo-Sphere-Viewer/master.svg?style=flat-square)](https://travis-ci.org/mistic100/Photo-Sphere-Viewer)
 
 Photo Sphere Viewer is a JavaScript library that allows you to display 360×180 degrees panoramas on any web page. Panoramas must use the equirectangular projection and can be taken with the Google Camera, the Ricoh Theta or any 360° camera.
@@ -32,8 +33,7 @@ Install Node and Bower dependencies `npm install & bower install` then run `grun
 ### Other commands
 
  * `grunt test` to run jshint/jscs/scsslint.
- * `grunt watch` to automatically build the library when modifying the source files.
- * `grunt server` to open the example page with automatic build and livereload.
+ * `grunt serve` to open the example page with automatic build and livereload.
 
 ## License
 This library is available under the MIT license.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "Photo-Sphere-Viewer",
-  "version": "3.2.1",
   "authors": [
     {
       "name": "Jérémy Heleine",
@@ -25,6 +24,9 @@
     "uevent": "~1.0.0",
     "doT": "master"
   },
+  "devDependencies": {
+    "three.js-examples": "master"
+  },
   "keywords": [
     "photosphere",
     "panorama",
@@ -43,8 +45,5 @@
     "tests",
     "package.json",
     "Gruntfile.js"
-  ],
-  "devDependencies": {
-    "threejs-examples": "master"
-  }
+  ]
 }
diff --git a/dist/photo-sphere-viewer.css b/dist/photo-sphere-viewer.css
@@ -1,5 +1,5 @@
 /*!
- * Photo Sphere Viewer 3.2.1
+ * Photo Sphere Viewer 3.2.2
  * Copyright (c) 2014-2015 Jérémy Heleine
  * Copyright (c) 2015-2016 Damien "Mistic" Sorel
  * Licensed under MIT (http://opensource.org/licenses/MIT)