rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity
10,739 Commits 108 Branches 89 Tags 547 MiB
c683e7dea7
Commit Graph

153 Commits

Author SHA1 Message Date
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
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671 grunt 2014-03-08 19:32:40 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
67c747a109 grunt 2014-03-08 15:30:18 -08:00
Chris Rebert
c8379ff2c7 S H R I N K W R A P 2014-03-07 16:20:53 -08:00
Mark Otto
d44e98b34d G R U N T 2014-03-07 00:50:28 -08:00
Mark Otto
6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
XhmikosR
73ad81d89c Add time-grunt plugin. 2014-03-07 08:47:23 +02:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Chris Rebert
56a5d93b82 switch to grunt-css-flip for RTL CSS generation 2014-03-06 12:31:28 -08:00
Zlatan Vasović
c1d3337c74 Run grunt update-shrinkwrap 2014-03-05 18:07:50 +01:00
Mark Otto
1399497a02 grunt 2014-03-04 00:30:40 -08:00
XhmikosR
cd65e512a2 Update dependencies. 2014-03-02 09:27:01 +02:00
XhmikosR
e5affbfa0a Run grunt. 2014-03-01 20:58:53 +02:00
XhmikosR
1e06cdff2f Run grunt update-shrinkwrap. 2014-02-26 19:34:02 +02:00
Chris Rebert
7b386a566f update boto & s3_cache.py 2014-02-25 19:40:15 -08:00
Chris Rebert
8556fa44a3 switch browserName from "googlechrome" to "chrome" per @Jonahss in #12647 2014-02-24 13:11:17 -08:00
XhmikosR
af83e569c3 Update grunt-contrib-connect. 2014-02-23 10:56:27 +02:00
Supergibbs
49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
Chris Rebert
accc95ccd6 regenerate npm-shrinkwrap.canonical.json 2014-02-13 17:57:24 -08:00
Chris Rebert
cdb381bb75 bump grunt-exec to v0.4.5 & add missing tilde to version spec 2014-02-13 13:55:36 -08:00
XhmikosR
2d18944d98 Update dependencies. 2014-02-13 11:12:05 -08:00
Mark Otto
385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Chris Rebert
1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -08:00
Mark Otto
8551f42ae2 Merge branch 'master' into pr/12412 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
 2014-02-11 09:50:40 -08:00
Chris Rebert
2bc29b4581 chrome => googlechrome in Sauce; fixes #12647 2014-02-10 12:11:10 -08:00
Mark Otto
3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Chris Rebert
7861f6e8a5 possibly avoid some extra S3 charges 
Refs https://github.com/boto/boto/issues/2078
 2014-02-05 10:45:05 -08:00
Chris Rebert
46f9d27142 reorganize all grunt tasks into one directory 
also fixes #12581
 2014-02-04 13:18:54 -08:00
Chris Rebert
b16efebc8e disable OS X Chrome in Selenium tests to fix the build 2014-02-04 01:51:40 -08:00
Mark Otto
58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto
d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Chris Rebert
50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap 
Do npm caching based on npm-shrinkwrap.canonical.json
 2014-01-26 20:46:14 -08:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Chris Rebert
6717f642bb re-enable OS X Chrome in Sauce tests 2014-01-25 17:55:52 -08:00
Chris Rebert
d56def706a update to iOS v7 in Sauce test config 2014-01-25 17:02:02 -08:00
Chris Rebert
9e862cdf70 enable Linux Chrome & Linux Firefox in Sauce tests 2014-01-21 16:28:38 -08:00
Chris Rebert
6f1236f81a document S3 cache more fully; fixes #12289 2014-01-19 18:48:35 -08:00
Chris Rebert
04cfca25af s3_cache.py: fix name in USAGE message 2014-01-19 15:12:09 -08:00
Chris Rebert
ee396aeb8e enable IE10 for Sauce tests 2014-01-16 19:53:02 -08:00
Chris Rebert
bd8ef99028 temporarily disable OS X Chrome Sauce test since it's being flaky 
e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds
 2014-01-16 19:52:24 -08:00
Chris Rebert
600f62dc78 Merge pull request #12265 from twbs/ie-11 
enable IE11 in Sauce tests
 2014-01-16 17:00:46 -08:00
Chris Rebert
ecf8148c3f Merge pull request #12264 from twbs/mavericks-safari-7 
upgrade to Safari 7 in Sauce tests
 2014-01-16 16:10:50 -08:00
Chris Rebert
4a50ac0bdd enable IE11 in Sauce tests 2014-01-16 15:35:08 -08:00
Chris Rebert
ded7008e40 upgrade to Safari 7 in Sauce tests 2014-01-16 14:51:41 -08:00
Chris Rebert
1ca0f8dbc0 re-enable OS X Firefox in Sauce tests 2014-01-16 14:47:11 -08:00
Mark Otto
7a2c352b50 Don't test Linux browsers since we don't support them officially and they're failing our tests 2014-01-10 19:04:11 -08:00
Chris Rebert
6ecdb31009 Sauce now supports latest Firefox on OS X Mavericks 2013-12-29 21:15:29 -08:00
Chris Rebert
0fe777b271 default to latest Firefox version on OS X 2013-12-29 21:13:56 -08:00
Chris Rebert
990c2392e5 mv sauce_browsers.yml out of the project root 2013-12-29 20:25:40 -08:00
Zlatan Vasović
d381771f6a Replace UTF-8 characters in s3_cache.py with ASCII characters 2013-12-25 20:19:59 +01:00