rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
9,086 Commits 108 Branches 89 Tags 547 MiB
ed410667df
Commit Graph

82 Commits

Author SHA1 Message Date
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
Chris Rebert
498f00a244 use S3-cached Jekyll install 2013-12-15 23:52:44 -08:00
Chris Rebert
95c72b573e make S3 caching significantly more generic 2013-12-15 21:12:33 -08:00
Chris Rebert
42697a4ecb use S3-based node_modules caching 2013-12-13 17:20:32 -08:00