0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

208 Commits

Author SHA1 Message Date
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00
Mark Otto
c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
XhmikosR
f5a5621af2 Update devDependencies. 2015-01-16 17:49:58 +02:00
Chris Rebert
050babda0d update shrinkwrap 2015-01-07 17:44:16 -08:00
Chris Rebert
b3b7ece174 update shrinkwrap 2015-01-06 14:13:07 -08:00
Chris Rebert
796634eb95 update shrinkwrap
[skip sauce]
2015-01-05 16:33:43 -08:00
Mark Otto
0e5d17d5f6 Merge branch 'master' into v4
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
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	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/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.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/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	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/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Chris Rebert
2166f238d7 Merge pull request #15456 from twbs/bump-clean-css
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-30 00:12:38 -08:00
Chris Rebert
9e66526766 update shrinkwrap 2014-12-29 12:00:47 -08:00
Chris Rebert
c14ff80f01 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 20:29:42 -08:00
Chris Rebert
d6ab6731e6 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 19:49:12 -08:00
Chris Rebert
a462676075 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 19:37:16 -08:00
Chris Rebert
109e4c7c16 update shrinkwrap
[skip sauce]
2014-12-28 18:55:50 -08:00
Chris Rebert
6099bfdea8 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 18:45:56 -08:00
Chris Rebert
952f7e9a4e update shrinkwrap 2014-12-28 18:32:02 -08:00
Gleb Mazovetskiy
8a51daf280 Compile with Ruby Sass or libsass.
* Separate configs for libsass and sass.
* Sass compiler selected based on `process.env.TWBS_SASS`.
* Travis:
  * Use Gemfile to manage ruby dependencies.
  * Run core tests with both Sass compilers.
  * Only install/cache ruby gems required by the test subset.
* Grunt: `update-gemfile-lock` task a la `update-shrinkwrap`.
2014-12-24 22:21:39 +02:00
Chris Rebert
8be858aac4 update shrinkwrap
[skip validator]
2014-12-12 14:19:42 -08:00
Chris Rebert
0d413c5c08 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-12 14:08:03 -08:00
Chris Rebert
5f41801083 update shrinkwrap 2014-12-12 13:22:09 -08:00
XhmikosR
4e27c48248 Run grunt. 2014-12-11 08:24:31 +02:00
XhmikosR
762acc826f Merge pull request #15293 from twbs/grunt-contrib-compress
Add grunt-contrib-compress.
2014-12-09 10:19:05 +02:00
XhmikosR
afa46515d0 Update glob. 2014-12-09 07:59:57 +02:00
XhmikosR
71f6dd25fc Add grunt-contrib-compress.
Now, the zip file is created when running `grunt prep-release`.

[ci skip]
2014-12-09 07:53:11 +02:00
Chris Rebert
405410a924 Travis: install scss-lint 2014-12-08 18:34:15 -08:00
Gleb Mazovetskiy
2033f169b5 Update test-infra/npm-shrinkwrap.json 2014-12-05 11:38:19 +00:00
XhmikosR
61bbe74df1 Update devDependencies. 2014-11-30 12:51:16 +02:00
Chris Rebert
a7682e3fde bump remarkable devDependency to ~1.4.1
[skip sauce]
2014-11-13 13:53:40 -08:00
XhmikosR
13d2a03379 Pin npm-shrinkwrap to v5.0.0 so that it works with npm 2.x.
Fixes #15105.
2014-11-13 22:01:12 +02:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
XhmikosR
07c1881bc2 Update npm-shrinkwrap. 2014-11-12 09:51:28 +02:00
XhmikosR
7047f9df14 Update devDependencies. 2014-11-10 12:54:23 +02:00
Mark Otto
16dbdbd7a2 Merge branch 'master' into v3.3.0
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
2014-10-29 11:56:48 -07:00
XhmikosR
5a83be362a Update shrinkwrap. 2014-10-29 19:44:14 +02:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Chris Rebert
5589a82e80 update shrinkwrap 2014-10-28 11:35:21 -07:00
XhmikosR
0ad97ab446 Update node dependencies. 2014-10-25 14:12:20 +03:00
Chris Rebert
16a5f874d0 grunt update-shrinkwrap
[skip sauce]
2014-10-23 13:26:48 -07:00
XhmikosR
e26fcf470f Update dependencies.
Close #14664.
2014-09-25 18:39:42 +03:00
Chris Rebert
4a3931d4c5 document S3Cachefile.json 2014-09-22 13:22:34 -07:00
XhmikosR
5befcb991c Update dependencies. 2014-09-08 09:03:26 +03:00
XhmikosR
fe896923fc Update grunt-jscs. 2014-08-30 08:43:44 +03:00
XhmikosR
701c27e22e Update dev dependencies. 2014-08-26 13:51:05 +03:00
Chris Rebert
ff18f380d5 Add retries to uncached-npm-install.sh
Pull requests are frequently failing on Travis due to npm flakiness
(I think) travis_retry isn't available in indirect subshells like this
2014-08-14 17:59:55 -07:00
Chris Rebert
b3e8001be2 bump grunt-autoprefixer to ~1.0.0 2014-08-05 18:38:29 -07:00
Chris Rebert
553c5d6f86 update shrinkwrap 2014-07-31 14:14:24 -07:00
XhmikosR
97cb2803d7 Run grunt. 2014-07-22 08:31:36 +03:00
XhmikosR
8d435cbb3c Run grunt. 2014-07-22 08:25:41 +03:00
XhmikosR
503ec4e5db Update dependencies. 2014-07-10 09:58:23 +03:00
Chris Rebert
aa9182cab4 properly integrate Rouge into the Travis build; fixes #14078
[skip sauce]
2014-07-08 10:49:22 -07:00
XhmikosR
0a8845c3fd Update package.json.
* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps
2014-07-06 14:25:56 +03:00
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +03:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
XhmikosR
4abb095783 Run grunt.
Revert a991cd572c.
2014-06-25 02:07:17 +03:00
Chris Rebert
49fe75d138 update shrinkwrap to get clean-css v2.2.3
Refs #13914
Refs https://github.com/GoalSmashers/clean-css/issues/302
2014-06-24 14:49:44 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0
update shrinkwrap too
2014-06-24 12:17:24 -07:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
XhmikosR
898328655f Update dependencies. 2014-06-23 03:12:16 +03:00
Chris Rebert
856bc8694c bump npm-shrinkwrap to ~3.1.4 2014-06-19 16:04:40 -07:00
Heinrich Fenkart
f983e4944f S H R I N K W R A P 2014-06-19 23:37:01 +02:00
Chris Rebert
3c4ba2a08c Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
2014-06-19 11:46:37 -07:00
XhmikosR
e42de7511a Update dependencies. 2014-06-17 18:29:17 -07:00
Chris Rebert
624800aa4f bump load-grunt-tasks to ~0.5.0
[skip validator] [skip sauce]
2014-06-13 12:02:14 -07:00
Chris Rebert
2213a5b756 bump grunt-contrib-connect to ~0.8.0 2014-06-09 17:32:10 -07:00
Chris Rebert
b4ab047b81 update shrinkwrap 2014-06-09 17:26:49 -07:00
Chris Rebert
e91eaa2884 update shrinkwrap
[skip validator]
2014-06-04 12:40:53 -07:00
Chris Rebert
19987cc285 update shrinkwrap
[skip sauce] [skip validator]
2014-06-04 12:21:42 -07:00
Chris Rebert
c6cb8abdce update shrinkwrap
[skip validator]
2014-05-23 12:55:08 -07:00
Chris Rebert
02ca217278 update shrinkwrap
[skip sauce]
2014-05-23 12:48:38 -07:00
Chris Rebert
6fef447a62 bump grunt-saucelabs to v5.1.3 2014-05-13 14:54:41 -07:00
Chris Rebert
150ca95b19 unlock & bump grunt-jscs-checker to ~0.4.3 2014-05-07 13:28:02 -07:00
Chris Rebert
64fdbd7621 bump grunt-jscs-checker to v0.4.1; refs #13512 2014-05-05 12:31:17 -07:00
Chris Rebert
5728b5791c update-shrinkwrap 2014-05-05 12:13:14 -07:00
XhmikosR
30b07b942e Run grunt. 2014-04-26 08:35:48 +03:00
Chris Rebert
0b6f1906cd better way of tracking what caches need to be uploaded; fixes #13270 2014-04-03 14:57:56 -07:00
Chris Rebert
718a6c5da7 move some caching info+logic out of .travis.yml; fixes #13136 2014-04-03 13:44:42 -07:00
Chris Rebert
2878d6ef83 grammar 2014-04-03 11:53:35 -07:00
Chris Rebert
9c7e86be99 add timing logic+output to s3_cache.py 2014-04-03 11:34:15 -07:00
XhmikosR
4c2626fecb Run grunt. 2014-04-03 10:53:44 +03:00
XhmikosR
8c95ff748f Run grunt. 2014-04-01 08:26:47 +03:00
Chris Rebert
db6572e726 bump patch versions of 3 grunt tasks 2014-03-30 17:26:13 -07:00
Chris Rebert
35d34ccfaa bump grunt-saucelabs to v5.1.1 2014-03-30 17:17:59 -07:00
Chris Rebert
b5ae8f9722 grunt update-shrinkwrap build-customizer dist 2014-03-28 11:19:22 -07:00
XhmikosR
10586bf040 Run grunt. 2014-03-27 08:02:51 +02:00
Mark Otto
c6648d58f0 grunt 2014-03-24 19:09:30 -07:00
XhmikosR
30cc625c5c Update time-grunt to v0.3.1. 2014-03-23 08:13:38 +02:00
XhmikosR
f2952aeccf Update grunt-contrib-less to v0.11.0. 2014-03-20 07:29:07 +02:00
Chris Rebert
96525fdec4 move sauce_browsers.yml into /grunt/; fixes #13065 2014-03-16 20:30:50 -07:00
Mark Otto
b7ab799824 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs/dist/js/bootstrap.min.js
2014-03-16 19:06:17 -07:00
fat
dd7cab84f6 build 2014-03-16 18:44:58 -07:00
XhmikosR
d475da5b0f Update dependencies. 2014-03-16 06:53:15 +02:00
Chris Rebert
1751922ca0 upgrade to grunt-css-flip v0.2.0 2014-03-12 16:59:58 -07:00
Chris Rebert
065fe98a29 use stricter error checking in uncached-npm-install.sh
Closes #13045
2014-03-12 13:50:11 -07:00
XhmikosR
d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Mark Otto
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
Mark Otto
5e6d16ef4d grunt 2014-03-08 21:05:23 -08:00
Mark Otto
b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00