Mark Otto
|
169d2a4a78
|
Merge branch 'master' into v4
|
2015-06-18 23:56:43 -07:00 |
|
Chris Rebert
|
ffe646bb08
|
Sauce tests: upgrade iOS to v8.2
[skip validator]
|
2015-04-07 13:00:52 -07:00 |
|
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 |
|
Chris Rebert
|
9bdaf03607
|
Use OS X 10.10 for Sauce iPhone simulator
[skip validator]
|
2015-02-22 19:01:36 -08:00 |
|
Chris Rebert
|
7d8bad586b
|
Merge pull request #34 from twbs/sauce-android-notes
update Android comments in sauce_browsers.yml
|
2014-12-16 19:51:48 -08:00 |
|
Chris Rebert
|
35db839149
|
update Android comments in sauce_browsers.yml
|
2014-12-16 19:50:33 -08:00 |
|
Chris Rebert
|
e444c2c58f
|
remove IE8 from Sauce tests
|
2014-12-16 19:21:48 -08:00 |
|
Chris Rebert
|
a7ae8c91f2
|
upgrade iOS tests to 8.1
[skip validator]
|
2014-11-15 21:28:11 -08:00 |
|
Chris Rebert
|
eb93b5db5f
|
upgrade OS X tests to Yosemite
[skip validator]
|
2014-11-15 21:20:45 -08:00 |
|
Chris Rebert
|
0b9f69b9c8
|
Update Sauce iOS Safari test to iOS 8.0
[skip validator]
|
2014-10-27 15:26:55 -07:00 |
|
Chris Rebert
|
532dffdd46
|
reenable Win7 IE8-9 in Sauce
|
2014-06-24 12:37:44 -07:00 |
|
Chris Rebert
|
6352c85a65
|
reenable OS X Chrome in Sauce
|
2014-06-24 12:37:44 -07:00 |
|
Chris Rebert
|
a419e41c32
|
Sauce tests: update iOS to v7.1
|
2014-03-30 18:00:06 -07:00 |
|
Chris Rebert
|
96525fdec4
|
move sauce_browsers.yml into /grunt/; fixes #13065
|
2014-03-16 20:30:50 -07:00 |