Mark Otto
|
c16fee5efd
|
Merge branch 'master' into v4
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
|
2015-03-01 13:44:10 -08:00 |
|
Heinrich Fenkart
|
4345e24479
|
Use different way to make failing test more visible in Sauce
|
2015-03-01 09:20:00 +01:00 |
|
Chris Rebert
|
4ff9c54cdd
|
Use QUnit.log(...) instead of QUnit.log = ...
Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-log-callback-with-qunit-log-callback-for-all-reporting-callbacks
|
2015-02-25 23:29:27 -08:00 |
|
fat
|
834220ea20
|
bootstrap onto closure
|
2015-02-11 11:29:43 -08:00 |
|
Chris Rebert
|
4102a67f33
|
fix typo in comment
|
2014-10-30 01:47:48 -07:00 |
|
Heinrich Fenkart
|
cf482dbb0b
|
Fix the iOS 8 unit test failures
Resolves #14919.
|
2014-10-30 09:35:53 +01:00 |
|
Chris Rebert
|
6f6466330d
|
Make it easier to see failing tests in Sauce screencasts
...by hiding passing tests in the list of tests.
|
2014-09-17 18:33:39 -07:00 |
|
Heinrich Fenkart
|
4950fe6f4e
|
Perform a cleanup after each test
|
2014-07-06 09:24:22 +02:00 |
|
Heinrich Fenkart
|
1e64c4c0ba
|
Update QUnit settings/QUnit phantomjs bridge to new versions
|
2014-07-06 09:24:22 +02:00 |
|
Chris Rebert
|
a54e6d4ea9
|
rename jquery.js -> jquery.min.js since it's minified
|
2014-04-19 18:25:40 -07:00 |
|
XhmikosR
|
d74aee4093
|
tests/index.html: re-indent.
|
2014-03-24 09:30:44 +02:00 |
|
XhmikosR
|
cfb7093dc0
|
tests/index.html: add missing meta charset.
|
2014-03-24 09:28:57 +02:00 |
|
jonahss
|
7a80b801d7
|
updated qunit test reporting so sauce labs can report failing tests
|
2014-02-21 18:54:50 -08:00 |
|
Zlatan Vasović
|
a4dac463e0
|
Improve js/tests/index.html
- Improve comments.
- Remove `transition.js` script load as `transition.js` unit test doesn't exist.
|
2014-02-18 10:43:24 +01:00 |
|
fat
|
2f76821a4d
|
new qunit
|
2014-01-16 13:33:09 -08:00 |
|
Chris Rebert
|
b260d93c58
|
more detailed QUnit test results in Sauce
|
2014-01-14 20:21:15 -08:00 |
|
Zlatan Vasović
|
62c905f5bc
|
Remove [type]
type="text/css" isn't needed
|
2013-10-09 09:45:05 +02:00 |
|
John-Philip Johansson
|
0d33455ef4
|
Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
|
2013-07-26 00:39:14 -07:00 |
|
fat
|
140ef2320b
|
change namespace back to dot notation and someother js shizzle
|
2013-05-16 20:19:51 -07:00 |
|
fat
|
14651035de
|
a bunch javascript junk
|
2013-05-16 11:06:30 -07:00 |
|
Stephen Edgar
|
1b132ddcb4
|
'js' folder .editorconfig code guide updates
|
2013-04-23 17:34:27 +10:00 |
|
Jacob Thornton
|
dcf75697ec
|
some progress on affix plugin
|
2012-07-22 18:28:39 -07:00 |
|
Jacob Thornton
|
03f78f7a60
|
run qunit tests in phantomjs for travis-ci
|
2012-04-19 17:34:07 -07:00 |
|
Jacob Thornton
|
bccc2cb719
|
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
|
2012-03-24 18:20:09 -07:00 |
|
Jacob Thornton
|
527fb87dad
|
add /head
|
2012-03-17 21:29:56 -07:00 |
|
Jacob Thornton
|
6f2f947a43
|
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
|
2012-01-11 21:42:55 -08:00 |
|
Jacob Thornton
|
dd99e2d048
|
start of autocomplete plugin
|
2012-01-06 18:30:32 -08:00 |
|
Jacob Thornton
|
1ef5fa7d6b
|
giant refactor - all spec passing again...
|
2011-12-20 18:02:47 -08:00 |
|
Jacob Thornton
|
523e02f7df
|
fix scrollspy simplify stuff more - break everything.
|
2011-10-19 23:12:50 -07:00 |
|
Jacob Thornton
|
dcf9aabc44
|
get all spec passing again
|
2011-09-11 22:58:51 -07:00 |
|
Jacob Thornton
|
5f4e30ed1d
|
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
|
2011-09-09 22:47:49 -07:00 |
|