Merge branch 'develop'

jmdobry · Oct 30, 2013 · ca8e6ee · ca8e6ee
2 parents 5c43520 + 7f21576
commit ca8e6ee
Show file tree

Hide file tree

Showing 12 changed files with 1,270 additions and 736 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@ libpeerconnection.log
 coverage/Chrome*/*
 coverage/Phantom*/*
 coverage/Firefox*/*
-coverage-*
+coverage/
 
-bower_components/
-dist/
+bower_components/
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -74,28 +74,17 @@ module.exports = function (grunt) {
             options: {
                 coverage_dir: 'coverage'
             }
-        },
-        jsdoc: {
-            dist: {
-                src: ['dist/angular-cache.js'],
-                options: {
-                    destination: 'docs',
-                    lenient: true,
-                    verbose: true,
-                    private: true
-                }
-            }
         }
     });
 
     grunt.registerTask('release', ['clean', 'jshint', 'copy', 'uglify', 'karma:dev']);
-    grunt.registerTask('build', ['clean', 'jshint', 'copy', 'uglify', 'karma:dev', 'jsdoc', 'clean']);
+    grunt.registerTask('build', ['clean', 'jshint', 'copy', 'uglify', 'karma:dev', 'clean']);
     grunt.registerTask('default', ['build']);
     grunt.registerTask('test', ['karma:dev']);
 
     // Used by the CLI build servers
     grunt.registerTask('travis', ['clean', 'jshint', 'copy', 'uglify', 'karma:travis', 'coveralls']);
 
     // Only used on the gh-pages branch
-    grunt.registerTask('pages', ['clean', 'jshint', 'build', 'copy', 'uglify', 'karma:release', 'jsdoc']);
+    grunt.registerTask('pages', ['clean', 'jshint', 'build', 'copy', 'uglify', 'karma:release']);
 };
diff --git a/bower.json b/bower.json
@@ -26,7 +26,6 @@
         "karma.conf.js",
         "libpeerconnection.log",
         ".gitignore",
-        ".travis.yml",
-        "docs/"
+        ".travis.yml"
     ]
 }
diff --git a/demo/angular-1.1.5.min.js b/demo/angular-1.1.5.min.js
diff --git a/demo/bootstrap.min.css b/demo/bootstrap.min.css
diff --git a/demo/demo.js b/demo/demo.js
diff --git a/demo/github.css b/demo/github.css
diff --git a/demo/highlight.pack.js b/demo/highlight.pack.js