11986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Patrick H. Lauke	9bbc0d76f5	Add upstream patch comment	2015-03-02 14:36:36 +00:00
Bootstrap's Grunt bot	4311e09b04	automatic grunt dist	2015-03-02 12:41:16 +00:00
Patrick H. Lauke	8e6934c135	Merge pull request #15947 from patrickhlauke/ios-click-fix-role-button ... iOS fix for role="button" elements; [fixes #15935]	2015-03-02 12:35:33 +00:00
Chris Rebert	46f5a8f478	Merge pull request #15970 from twbs/the-future-is-now-qunit ... Disable deprecated QUnit global methods	2015-03-02 02:39:29 -08:00
XhmikosR	f8e34ff48b	Disable es3 for tests and customizer.js.	2015-03-02 11:16:06 +02:00
XhmikosR	ea3c7028bd	Run grunt.	2015-03-02 11:16:06 +02:00
Chris Rebert	c291c12cb1	Disable deprecated global QUnit method aliases to prevent backsliding on QUnit v2 readiness	2015-03-01 19:50:11 -08:00
Chris Rebert	c80872235f	Merge pull request #15955 from twbs/fixture-on-screen-ios ... Unit tests: Only display fixture on-screen for iOS	2015-03-01 18:28:46 -08:00
Bootstrap's Grunt bot	de0722f989	automatic grunt dist	2015-03-02 00:11:14 +00:00
Chris Rebert	015e63f6df	Merge pull request #15593 from neoeno/handle_multiple_zero_offset_scrollspy_elements ... Handle multiple zero-offset Scrollspy elements.	2015-03-01 16:04:04 -08:00
Caden Lovelace	a1aa0f8afd	Handle multiple zero-offset Scrollspy elements. ... When the first two elements in a scrollspy content block have a document offset of zero (i.e. they're hard against the top of the page), Scrollspy would switch between them on every scroll event. This could happen, for example, in a system of nested sections: ``` <section id="animals"> <section id="dogs"> Content </section> </section> ``` This ocurred because Scrollspy's check to see if it's at the end of the array of sections uses `!arr[index]`. This misses the case where `arr[index]` does exist and is zero. This commit explicitly checks the array bounds.	2015-03-01 23:55:39 +00:00
Chris Rebert	08e0f23929	Merge pull request #15965 from kkirsche/fixURL ... [Docs / README] Fix URL to match the plugin keyword recommendation	2015-03-01 14:32:31 -08:00
Chris Rebert	a15baba756	Merge pull request #15964 from kkirsche/addAccidentlyRemovedText ... [Docs] Replace accidently removed tooltip / popover text	2015-03-01 14:27:04 -08:00
Mark Otto	9dc5868ea7	Remove dupe docs CSS, move anchor styles to scss directory, recompile	2015-03-01 14:13:13 -08:00
Mark Otto	517977fca4	fix validation, run grunt dist	2015-03-01 14:11:22 -08:00
Kevin Kirsche	673cd67798	Fix URL to match the keyword ... Fix URL to match the keyword	2015-03-01 16:44:13 -05: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
Kevin Kirsche	7b3e4d8423	Replace accidently removed text ... X-Ref #15742 cc: @mdo	2015-03-01 16:24:12 -05:00
Heinrich Fenkart	fd35779f0e	Input group sizes: Properly position .form-control-feedback ... Ref https://github.com/twbs/bootstrap/issues/12868#issuecomment-76291513 Ref 7733f24	2015-03-01 10:01:14 +01:00
Heinrich Fenkart	20fb55a840	Unit tests: Only display fixture on-screen for iOS ... Since only on iOS tests fail when the fixture is displayed off-screen, see https://travis-ci.org/twbs/bootstrap/jobs/52605742	2015-03-01 09:49:59 +01:00
Heinrich Fenkart	1ba2630ccf	Merge pull request #15954 from twbs/sauce-hidepassed ... Use different way to make failing test more visible in Sauce	2015-03-01 09:41:10 +01:00
Heinrich Fenkart	4345e24479	Use different way to make failing test more visible in Sauce	2015-03-01 09:20:00 +01:00
Patrick H. Lauke	3173efd9d9	Merge pull request #15929 from kkirsche/patch-5 ... [Fixes #15928] Encourage use of icons with form validation states for co...	2015-02-28 22:11:30 +00:00
Kevin Kirsche	94406bcae0	[Fixes #15928] Encourage use of icons with form validation states for colorblind users ... [Fixes #15928] Encourage use of icons with form validation states for colorblind users Update text per @patrickhlauke's feedback Update text per @patrickhlauke's feedback. Fix stupid grammar mistake	2015-02-28 17:07:20 -05:00
Patrick H. Lauke	9c3e7e5861	iOS fix for role="button" elements; [fixes #15935] ... Fixes "clickability" issue (and more generally, the firing of events such as focus as well) for traditionally non-focusable elements with role="button" (see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile) Fixes #15935	2015-02-28 15:41:55 +00:00
Chris Rebert	50a51ffc36	Merge pull request #96 from twbs/gem-badge ... Add Ruby Gem badge to README	2015-02-27 02:33:25 -08:00
Bootstrap's Grunt bot	ad379ffb4a	automatic grunt dist	2015-02-27 07:51:17 +00:00
Mark Otto	049e86f47e	Merge pull request #15826 from kkirsche/patch-19 ... [Fixes #15825] .initialism class should use mixin	2015-02-26 23:49:04 -08:00
Bootstrap's Grunt bot	fb3610c3af	automatic grunt dist	2015-02-27 04:11:09 +00:00
Chris Rebert	1623280f59	Merge pull request #15941 from twbs/ijcheung-collapse-update-all-triggers ... Update all collapse triggers with .collapsed class and aria-expanded	2015-02-26 20:00:50 -08:00
Ivan Cheung	d5071b19f1	Update all collapse triggers with .collapsed class and aria-expanded ... Fixes #15741 Closes #15751 by merging it.	2015-02-26 18:48:20 -08:00
Bootstrap's Grunt bot	984204c39e	automatic grunt dist	2015-02-26 14:21:13 +00:00
XhmikosR	05b444aee3	Run grunt.	2015-02-26 11:30:23 +02:00
Heinrich Fenkart	c65deddcce	Merge pull request #15933 from twbs/qunit-module-hooks ... Unit tests: Use new names of module hooks	2015-02-26 08:36:17 +01:00
Chris Rebert	9afb61fffd	QUnit.jsDump => QUnit.dump ... Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-jsdump-with-qunit-dump	2015-02-25 23:29:27 -08: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
Bootstrap's Grunt bot	4cb39987f0	automatic grunt dist	2015-02-26 07:21:21 +00:00
Heinrich Fenkart	3bb05b5fbb	Unit tests: Use new names of module hooks ... Refs #15893	2015-02-26 08:20:42 +01:00
Heinrich Fenkart	442d2dd458	Merge pull request #15930 from twbs/modal-restore-inline-padding ... Modal: Apply any preexisting body padding again after closing	2015-02-26 08:13:55 +01:00
nakupanda	142a9e4ae0	Modal: Apply any preexisting body padding again after closing	2015-02-26 08:02:06 +01:00
TJ	10c8dad848	Prevent collapsed navbar in Non-responsive Example ... Closes #15291 by merging it.	2015-02-25 22:53:21 -08:00
Bootstrap's Grunt bot	033dbfd06c	automatic grunt dist	2015-02-26 06:01:15 +00:00
Quentin Spencer-Harper	acc5f65756	Tooltip: Avoid creating an unnecessary tooltip when Tooltip#hide is called ... Fixed performance bug where a tooltip element is created and then immediately destroyed when tooltip.hide() is called and there is no existing tooltip element Resolves #15557 by merging it.	2015-02-26 06:53:58 +01:00
Bootstrap's Grunt bot	f43c67b0c5	automatic grunt dist	2015-02-26 05:51:21 +00:00
vsn4ik	b395f3526e	Dropdowns: Skip .disabled instead of .divider on keydown event ... Fixes #15147. Closes #15520 by merging it.	2015-02-26 06:42:09 +01:00
Bootstrap's Grunt bot	5debbec59f	automatic grunt dist	2015-02-26 05:01:07 +00:00
Heinrich Fenkart	cac6cfcd84	Merge pull request #15923 from kkirsche/useExplicitVariableDeclaration ... [Ref #15881] Use Explicit JS Variable Declarations rather than Chained	2015-02-26 05:55:27 +01:00
Bootstrap's Grunt bot	1d34615758	automatic grunt dist	2015-02-26 03:51:28 +00:00
Chris Rebert	a339bfb0ac	Merge pull request #15693 from huang-x-h/patch-1 ... tip method in popover.js can be removed	2015-02-25 19:49:26 -08:00
Kevin Kirsche	238be65786	[Ref #15881] Use Explicit Values rather than Chain ... [Ref #15881] Use Explicit Values for javascript variables rather than chained ones. From https://github.com/twbs/bootstrap/pull/15881#discussion_r25330647	2015-02-25 12:19:11 -05:00