0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

207 Commits

Author SHA1 Message Date
XhmikosR
db86b0ff17 Update devDependencies. 2015-09-05 08:13:43 +03:00
Mark Otto
750295306a Merge pull request #17370 from twbs/v4-dev-xmr-rm-csslint-references
Remove CSSLint references.
2015-09-01 20:23:13 -07:00
XhmikosR
48f50ab913 Remove the now unused grunt-contrib-jade references.
[skip sauce]
[skip validator]
2015-08-29 18:54:49 +03:00
XhmikosR
73c61199a1 Remove CSSLint references. 2015-08-27 18:49:08 +03:00
Chris Rebert
3cc25428be rm broken bundle update task & defunct custom RubyGem caching scheme
[skip sauce]
2015-08-25 23:00:18 -07:00
Chris Rebert
59011ccf7a Update shrinkwrap to help fix Travis build 2015-08-20 13:43:51 -07:00
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
XhmikosR
f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
Baraa Hamodi
f3b2ab6a45 Updated devDependencies.
Closes #16636 by merging a rebased+tweaked version of it.
[skip sauce]
2015-07-01 17:42:24 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
XhmikosR
704e3448bf Bump load-grunt-tasks. 2015-06-01 10:29:18 +03:00
XhmikosR
315907c97c Use https when possible. 2015-05-17 12:43:20 +03:00
XhmikosR
c56032a0e5 Remove grunt-banner completely.
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
XhmikosR
9bf6e107e3 Update dependencies. 2015-05-10 01:22:23 +03:00
XhmikosR
2662593583 Update grunt-banner. 2015-05-05 11:56:27 +03:00
XhmikosR
26ff019753 Update dependencies. 2015-05-05 06:50:17 +03:00
XhmikosR
2bc9d70069 Update clean-css to v3.2.6. 2015-04-28 12:12:05 +03:00
Chris Rebert
8c2d726e17 update shrinkwrap 2015-04-28 00:38:21 -07:00
XhmikosR
fa4d7d2bd2 Run grunt. 2015-04-26 14:03:35 +03:00
Chris Rebert
be6691cc04 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-23 13:12:39 -07:00
XhmikosR
09f98453ce Update devDependencies. 2015-04-19 00:07:37 +03:00
XhmikosR
e778dc1348 Add grunt-contrib-htmlmin.
Only used for the GitHub docs.
2015-04-08 09:27:38 +03:00
XhmikosR
381a55ed1a Update dependencies. 2015-04-08 09:24:23 +03:00
Chris Rebert
3094d8390c update shrinkwrap 2015-04-07 12:34:18 -07:00
Chris Rebert
e3695d6ea4 update shrinkwrap 2015-04-06 21:39:54 -07:00
Chris Rebert
3758d3964d Bump grunt-autoprefixer to ~3.0.0 2015-04-06 20:58:10 -07:00
Chris Rebert
b417251a23 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-06 18:31:49 -07:00
Chris Rebert
bd33dcf9f1 update shrinkwrap
[skip sauce]
[skip validator]
2015-04-06 18:21:30 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4
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-29 00:08:54 -07:00
Chris Rebert
4d652035dc v3.3.2 => v3.3.4 2015-03-16 08:39:31 -07:00
XhmikosR
0ca3fa42e8 Bump devDependencies. 2015-03-15 04:26:35 -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
7f7c7901ae bump time-grunt to ^1.1.0 2015-02-24 14:14:59 -08:00
Chris Rebert
d8ffd57b93 update shrinkwrap
[skip validator]
2015-02-22 18:47:00 -08:00
XhmikosR
b8a0ea1224 Update dependencies. 2015-02-20 11:35:39 +02:00
XhmikosR
b9aad573f9 Travis: test against node.js 0.12. 2015-02-16 21:09:32 -08:00
Chris Rebert
de90cd7a80 update shrinkwrap 2015-02-10 12:57:39 -08:00
XhmikosR
c388870cef Downgrade grunt-contrib-cssmin.
v0.12.0-v0.12.1 breaks paths in URL.
2015-02-10 10:49:59 +02:00
XhmikosR
a3419df829 Bump devDependencies. 2015-02-10 08:30:51 +02:00
Chris Rebert
aed1cd3121 update shrinkwrap 2015-02-04 21:15:20 -08:00
Chris Rebert
85ded1440c update shrinkwrap 2015-02-04 14:11:26 -08:00
Mark Otto
65a723b602 Update shrinkwrap. 2015-02-02 04:36:13 +02:00
XhmikosR
420088d316 Bump load-grunt-tasks. 2015-01-30 15:13:24 +02:00
Chris Rebert
6a84b5a090 update shrinkwrap 2015-01-23 16:03:23 -08:00
Chris Rebert
9238337cbb Merge branch 'master' into v4 2015-01-21 13:00:12 -08:00
Chris Rebert
92b267f357 update shrinkwrap 2015-01-20 13:05:58 -08:00
Chris Rebert
0b7f6b941a update shrinkwrap 2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc update grunt-saucelabs to ~8.5.0 2015-01-20 12:49:08 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
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 14:48:12 -08:00
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00