github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2015-03-29	Merge branch 'master' into v4	Mark Otto
	Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.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/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.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/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/migration.html js/affix.js js/alert.js js/button.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/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss
2015-03-16	v3.3.2 => v3.3.4	Chris Rebert

2015-01-23	Add woff2 font file to bower main files	Sebastian Nowicki
	If Bootstrap is installed through bower, the woff2 font file may not be copied over as it's not in the "main" files. The LESS files still reference the font file which results in errors.
2015-01-20	Merge branch 'master' into v4	Mark Otto
	Conflicts: _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_includes/components/thumbnails.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/download.html docs/_includes/getting-started/template.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/theme/index.html grunt/configBridge.json less/alerts.less less/badges.less less/jumbotron.less less/panels.less less/tables.less less/theme.less less/variables.less package.json scss/_button-group.scss scss/_buttons.scss scss/_forms.scss
2015-01-19	bump versions	Mark Otto

2015-01-19	Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"	Chris Rebert
	This reverts commit 2916ac43ed57baacc49d2cc7550b8d1dfe87b261. This reverts commit 3d635f30795deb11ee7feaea5595b78c70221389. This reverts commit 61a21205575aa03b4fbbacee2052d20bf75941d4. This change broke the Grunt build.
2015-01-19	fix main SCSS file paths	Chris Rebert
	Fixes 2916ac43ed57baacc49d2cc7550b8d1dfe87b261 errata FYI @glebm
2015-01-16	Rename scss/bootstrap.scss -> scss/_bootstrap.scss	Gleb Mazovetskiy
	This is required for Compass compatibility. See https://github.com/twbs/bootstrap-sass/issues/694 Also updates bower.json and package.json references to the main Sass file.
2014-12-01	Merge branch 'master' into v4	Mark Otto
	Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.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/input-groups.html docs/_includes/components/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.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/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.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/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less
2014-11-12	bump version to v3.3.1v3.3.1	Mark Otto

2014-11-10	Merge branch 'master' into derp	Mark Otto
	Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/button-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/browser-device-support.html docs/_includes/js/carousel.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/_includes/nav/getting-started.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/browser-bugs.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/justified-nav/index.html less/_forms.less less/_tooltip.less less/navs.less less/theme.less
2014-10-29	version bump	Mark Otto

2014-10-27	Merge branch 'master' into derp	Mark Otto
	Conflicts: Gruntfile.js dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/_includes/components/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/getting-started.html docs/_layouts/default.html docs/about.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/browser-bugs.html docs/components.html docs/components/navbar.md docs/css.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less
2014-10-23	Add jQuery version check to existing jQuery presence check	Heinrich Fenkart
	Fixes #14809. Closes #14825.
2014-07-08	Drop Glyphicons	Mark Otto

2014-07-06	only ignore /.*	Mark Otto

2014-06-26	bump to v3.2.0	Mark Otto

2014-04-12	added bower reference to main less file	The Big Red Geek

2014-03-25	Add `homepage` Bower property	Zlatan Vasović

2014-03-17	Merge pull request #13064 from ZDroid/description	Chris Rebert
	Add Bower package description
2014-03-17	move sauce_browsers.yml into /grunt/; fixes #13065	Chris Rebert

2014-03-14	Add Bower package description	Zlatan Vasović

2014-03-09	Don't ignore every dot file in Bower	Mark Otto

2014-03-07	Merge pull request #12891 from ZDroid/bower-json-paths	Mark Otto
	Remove ./ from bower.json paths
2014-03-04	add 'keywords' field to bower.json	Chris Rebert

2014-03-02	Remove ./ from bower.json paths	Zlatan Vasović

2014-03-02	Add bower.json keywords	Zlatan Vasović

2014-02-13	v3.1.1 bump	Mark Otto

2014-01-30	Bump versions, run gruntv3.1.0	Mark Otto

2014-01-09	Update paths in bower.json	Zlatan Vasović
	- Replace `.html`, `docs/assets` and `examples` with `docs` (new directory) - Instead of `_`, it's just `_config.yml`, without regex (speeds up bower download a few milliseconds)
2014-01-08	updated path docs-assets to docs/assets	Eduardo

2013-12-25	roll back version numbers to avoid broken links in docs and readme (fixes ↵	Mark Otto
	#12000)
2013-12-22	bower.json: sort by name.	XhmikosR

2013-12-19	version bump	Mark Otto

2013-12-16	Merge pull request #11732 from dak/include-dev-fonts-in-bower	Mark Otto
	Don't exclude fonts from bower installs
2013-12-08	Don't ignore Gruntfile, it's required for compile	Zlatan Vasović

2013-12-07	Drop browserstack.json from bower.json ignore	Zlatan Vasović

2013-12-06	bower.json: remove trailing spaces.	XhmikosR

2013-12-06	Don't exclude fonts from bower installs	Derek Kent
	Excluding fonts/ from bower installs causes glyphicons to be unavailable to projects using development Bootstrap LESS files.
2013-12-02	bump version numbers to 3.0.3	Mark Otto

2013-11-23	explicitly call out font files	Weston Platter
	Using wildcards to specify fonts causes errors for other npm modules, EG, https://github.com/blittle/bower-installer/issues/33. Additionally, it’s better to lock down files included in a library.
2013-11-15	Merge pull request #10353 from rwillrich/ignore-files	Chris Rebert
	Bower: Ignore development and documentation files on bower.json. Fix #10313
2013-11-07	update remaining version numbersv3.0.2	Chris Rebert

2013-10-30	3.0.1v3.0.1	Mark Otto

2013-09-27	bower.json: Modify `assets` directory on ignore to `docs-assets`	Rodrigo Willrich

2013-09-01	Bower: Ignore development and documentation files on bower.json. Fix #10313.	Rodrigo Willrich
	I've kept only the files I consider relevant to bower installation: - Files in dist directory; - Files in js directory; - Files in less directory; - bower.json file; - README.md file; - LICENSE file.
2013-08-21	Added fonts to "main" files	Thomas Welton
	When using bower the "main" property is used to specify the files that should be consumed by applications including the package as a dependency. Without including the fonts in this array the glyphicons do not work correctly as the relative font paths do not work after the "main" files are copied into my projects public dir using tools like https://github.com/yatskevich/grunt-bower-task For now I have manually copied the fonts dir in the location needed for my project. But by accepting this pull request this will not be necessary for me or for other people that use bower.
2013-08-14	Reference only not minified files in Bower	Breno Calazans
	Fixes #8985
2013-08-13	fixes #8985: only specify minified dist files for bower	Mark Otto

2013-07-29	Update bower.json	Breno Calazans