diff --git a/.hound.yml b/.hound.yml index 8a21bdf445..4589de64bc 100644 --- a/.hound.yml +++ b/.hound.yml @@ -10,7 +10,7 @@ javascript: eslint: enabled: true - config_file: js/.eslintrc + config_file: js/.eslintrc.json jscs: enabled: true diff --git a/.travis.yml b/.travis.yml index 058a26aa4e..2f5ad1e965 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ git: depth: 10 node_js: - "4" - - "5" + - "6" before_install: # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092 - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH") diff --git a/Gemfile.lock b/Gemfile.lock index 6ea5c72615..c1c04d6b6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM colorator (0.1) ffi (1.9.10) ffi (1.9.10-x64-mingw32) - jekyll (3.1.2) + jekyll (3.1.6) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -18,21 +18,21 @@ GEM jekyll-sass-converter (1.4.0) sass (~> 3.4) jekyll-sitemap (0.10.0) - jekyll-watch (1.3.1) - listen (~> 3.0) - kramdown (1.10.0) + jekyll-watch (1.4.0) + listen (~> 3.0, < 3.1) + kramdown (1.11.1) liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - mercenary (0.3.5) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + mercenary (0.3.6) rake (10.5.0) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) rouge (1.10.1) safe_yaml (1.0.4) - sass (3.4.21) + sass (3.4.22) scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) @@ -48,4 +48,4 @@ DEPENDENCIES scss_lint (~> 0.47.1) BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/Gruntfile.js b/Gruntfile.js index fb7753170f..b2f702e4e5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com + * Copyright 2013-2016 The Bootstrap Authors * Copyright 2013-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -106,13 +107,6 @@ module.exports = function (grunt) { } }, - eslint: { - options: { - configFile: 'js/.eslintrc' - }, - target: 'js/src/*.js' - }, - jscs: { options: { config: 'js/.jscsrc' @@ -437,7 +431,7 @@ module.exports = function (grunt) { testSubtasks.push('saucelabs-qunit'); } grunt.registerTask('test', testSubtasks); - grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); + grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); // JS distribution task. grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); diff --git a/LICENSE b/LICENSE index 7a300022c3..4e32163c07 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) Copyright (c) 2011-2016 Twitter, Inc. +Copyright (c) 2011-2016 The Bootstrap Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 1f027087a1..cc3d5b1a7f 100644 --- a/README.md +++ b/README.md @@ -131,4 +131,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr ## Copyright and license -Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). +Code and documentation copyright 2011-2016 the Bootstrap Authors and Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). diff --git a/_config.yml b/_config.yml index 78161d1660..afa68e8171 100644 --- a/_config.yml +++ b/_config.yml @@ -41,7 +41,7 @@ cdn: css_hash: "sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js js_hash: "sha384-vZ2WRJMwsjRMW/8U7i6PWi6AlO1L79snBrmgiDpgIWJ82z8eA5lenwvxbMV1PAh7" - jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js - jquery_hash: "sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" + jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js + jquery_hash: "sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js tether_hash: "sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index d6e9ff3fee..2298dba991 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -114,7 +114,7 @@ summary: > Right border of `` with overflowed options will select nearby `