diff --git a/CHANGES.txt b/CHANGES.txt index 93e00f3b06..a9b3a9ed96 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,12 @@ +New in v7.8.13 +============== + +* Add new Thai translation by Narumol Hankrotha and Jean Jordaan + (v8 backport) +* Hide “Incomplete language” message for overrides of complete + languages +* Restore ability to override messages partially + New in v7.8.12 ============== diff --git a/bower_components/livereload-js/.bower.json b/bower_components/livereload-js/.bower.json index 75566df054..ffba27ee70 100644 --- a/bower_components/livereload-js/.bower.json +++ b/bower_components/livereload-js/.bower.json @@ -1,6 +1,6 @@ { "name": "livereload-js", - "version": "2.2.1", + "version": "2.3.0", "main": "dist/livereload.js", "homepage": "http://livereload.com", "authors": [ @@ -27,11 +27,11 @@ "moduleType": [ "globals" ], - "_release": "2.2.1", + "_release": "2.3.0", "_resolution": { "type": "version", - "tag": "v2.2.1", - "commit": "91fdfa00a3e7fac0482397a315e18947c54bbfd3" + "tag": "v2.3.0", + "commit": "269c03edcf276e64b6015a199b11d3897ac18304" }, "_source": "https://github.com/livereload/livereload-js.git", "_target": "~2", diff --git a/bower_components/livereload-js/Gruntfile.js b/bower_components/livereload-js/Gruntfile.js index 1c417c33ff..445f37618d 100644 --- a/bower_components/livereload-js/Gruntfile.js +++ b/bower_components/livereload-js/Gruntfile.js @@ -18,6 +18,11 @@ module.exports = function(grunt) { }, src: ['lib/startup.js'], dest: 'dist/livereload.js' + }, + + test: { + src: ['test/html/browserified/main.js'], + dest: 'test/html/browserified/bundle.js' } }, @@ -35,7 +40,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-browserify'); grunt.loadNpmTasks('grunt-mocha-test'); - grunt.registerTask('build', ['coffee', 'browserify']); + grunt.registerTask('build', ['coffee', 'browserify:dist']); grunt.registerTask('test', ['mochaTest']); grunt.registerTask('default', ['build', 'test']); diff --git a/bower_components/livereload-js/README.md b/bower_components/livereload-js/README.md index 96491b9d4c..5b04feb415 100644 --- a/bower_components/livereload-js/README.md +++ b/bower_components/livereload-js/README.md @@ -16,6 +16,7 @@ The server notifies the client whenever a change is made. Available servers are: * [rack-livereload](https://github.com/johnbintz/rack-livereload) * [guard-livereload](https://github.com/guard/guard-livereload) * [grunt-contrib-watch](https://github.com/gruntjs/grunt-contrib-watch) +* [python-livereload](https://github.com/lepture/python-livereload) * more available on Google :-) * you can even write your own; refer to the [LiveReload protocol](http://help.livereload.com/kb/ecosystem/livereload-protocol) @@ -53,22 +54,35 @@ Would love, but doesn't seem possible: * live JS reloading -Installing using Bower and npm ------------------------------- +Installing using Bower +---------------------- -This script is published on Bower and npm. (But, to reiterate: the preferred method is to avoid installing it altogether, and instead use the one bundled with your LiveReload server/app/tool.) +This script is published on Bower. (But, to reiterate: the preferred method is to avoid installing it altogether, and instead use the one bundled with your LiveReload server/app/tool.) -Using Bower: +Installation: bower install livereload-js --save-dev This gives you a component containing a single script file, `dist/livereload.js`. -If you're using Browserify, you can require LiveReload via npm: + +Installing using npm and Browserify +----------------------------------- + +Including livereload.js into your Browserify bundle probably makes no sense, because livereload.js isn't something you would ship to production. + +But if you insist _and_ you know what you're doing, you can install LiveReload via npm: npm install livereload-js --save -Note that the package uses `window` and `document` globals, so won't run under Node.js environment. +and then add this to your bundle: + + window.LiveReloadOptions = { host: 'localhost' }; + require('livereload-js'); + +Note that livereload-js package uses `window` and `document` globals, so won't run under Node.js environment. + +The reason you need to specify `LiveReloadOptions` is that `livereload.js` won't be able to find its `