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

252 Commits

Author SHA1 Message Date
Chris Rebert
9d0f6c05f4 Sauce testing: set maxPollRetries to 4 for increased robustness 2015-01-05 12:40:43 -08:00
Zlatan Vasović
576230b92a Happy New Year 🎅 2015-01-01 01:23:48 +01:00
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419
Address #15419
2014-12-31 16:11:04 -08:00
Chris Rebert
96e108f2b2 Revert "remove Glyphicons docs autogeneration from Grunt"
This reverts commit 36b5308926.
This reverts PR #14065.

Turns out Glyphicons is more active than we'd thought.
2014-12-29 16:54:29 -08:00
Chris Rebert
f91071bc1b Bump grunt-contrib-cssmin to ~0.11.0 2014-12-28 19:58:29 -08: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
1f6f95a245 grunt-saucelabs now uses throttled instead of concurrency
[skip validator]
2014-12-08 14:58:06 -08:00
Chris Rebert
a527aaa114 Whitelist <li role="separator">...</li>
Refs https://www.w3.org/Bugs/Public/show_bug.cgi?id=27120
Refs #15263

[skip sauce]
2014-12-02 12:56:30 -08:00
XhmikosR
cb29c9a41d Add a target to generate the gh-pages files.
It sets `github: true` for us.
2014-11-20 08:02:05 +02:00
Chris Rebert
db95e0bd01 disable core tests for Savage builds 2014-11-19 16:00:46 -08:00
Heinrich Fenkart
ff5f9db68e HTML validation: No longer relax the X-UA-Compatible error
The validator no longer complains about it unless the value is different from `content=IE=edge`, see https://www.w3.org/Bugs/Public/show_bug.cgi?id=27091
2014-11-10 20:02:06 +01:00
Heinrich Fenkart
30df201abc Use a Jekyll plugin instead of the copy:configBridge grunt task 2014-11-05 18:35:13 +01:00
Heinrich Fenkart
d107004278 Remove duplicate code from Customizer/Gruntfile by sharing it 2014-11-04 12:35:38 +01:00
XhmikosR
a515191afd Customizer: include the minified files only on GitHub pages. 2014-10-29 07:30:57 +02:00
Mark Otto
0521913a99 Merge pull request #13824 from jsdf/node-requirable
Allow npm package to be resolved via node module resolution
2014-10-25 19:43:05 -07:00
Heinrich Fenkart
1604af041b Add jQuery version check to existing jQuery presence check
Fixes #14809.
Closes #14825.
2014-10-23 05:57:15 +02:00
XhmikosR
924c68f8bb Update FileSaver.js v2014-08-29. 2014-10-09 08:16:32 +03:00
XhmikosR
7ded2d185d Update Blob.js to v2014-07-24. 2014-10-09 08:16:31 +03:00
Chris Rebert
0013f12989 fix #14609 2014-09-17 17:36:07 -07:00
vsn4ik
1965f032ca Gruntfile.js: Simplify copy task. 2014-08-30 01:20:48 +04:00
James Friend
015ee2ed74 pulled output path out to gruntfile 2014-08-28 09:39:41 +08:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
	Gruntfile.js
2014-08-28 09:32:08 +08:00
James Friend
e7991a9a1e generate commonjs/npm entrypoint module via grunt task 2014-08-28 09:24:23 +08:00
Chris Rebert
06c4002019 Gruntfile: Fix #13949 by separating docs into separate task & refactoring 2014-08-14 11:42:13 -07:00
Chris Rebert
559f16572f Gruntfile: switch cssmin & jade tasks from files over to src & dest
Refs #14388.
2014-08-13 17:36:13 -07:00
vsn4ik
da8daa667c Gruntfile.js: Use user-friendly properties. 2014-08-13 23:12:09 +04:00
Chris Rebert
a8437f0d23 Merge pull request #14325 from hnrch02/cleanup-buttons-docs
Clean up buttons documentation
2014-08-08 12:23:55 -07:00
Heinrich Fenkart
2c625c7d1a Clean up buttons documentation 2014-08-06 06:10:51 +02:00
Michael J.
d80be40d04 Make grunt concat js files when watching 2014-08-06 10:22:16 +08:00
Michael J.
0c03d0c273 grunt now watch files in all folders/subfolders 2014-07-31 10:21:56 +08:00
Chris Rebert
031cb969d7 Have HTML5 validator ignore autocomplete="off" on input[type="checkbox"]
Not clear from the spec whether this is invalid per se.
But it is the current best known workaround for Firefox's unusual behavior.
2014-07-18 14:19:16 -07:00
vsn4ik
59171b3377 Gruntfile.js: Add semicolon in "_update-shrinkwrap" task. 2014-07-11 03:42:09 +04:00
Chris Rebert
5d1abf8b38 Merge pull request #14036 from twbs/fix-13575
Jekyll: Use non-minified assets when not running from GitHub Pages
2014-07-07 19:36:32 -07:00
Chris Rebert
36b5308926 remove Glyphicons docs autogeneration from Grunt
Simplifies the build tooling a teeny bit.
This data file shouldn't need to be updated for v3 ever again.
This task will also be unnecessary in v4.

[skip sauce] [skip validator]
2014-07-07 11:06:19 -07:00
Chris Rebert
1dc54dc160 use non-minified Bootstrap JS when on non-gh-pages 2014-07-03 13:40:47 -07:00
Chris Rebert
92fd25a2a2 use non-minified docs JS on non-gh-pages 2014-07-03 13:18:44 -07:00
Chris Rebert
b793fbb13a use non-minified docs CSS on non-gh-pages 2014-07-03 13:12:58 -07:00
XhmikosR
2a47034598 Copy all files in docs/dist.
Now we are on par with what we have on the gh-pages dist/ folder.
2014-07-01 07:38:38 +03:00
XhmikosR
b93b7b1b6d Revert "Revert "Turn off clean-css' advanced optimizations.""
This reverts commit e31c2edf88.
2014-06-25 01:53:10 +03:00
Chris Rebert
e31c2edf88 Revert "Turn off clean-css' advanced optimizations."
This reverts commit 25ca51319b.
2014-06-24 14:54:51 -07:00
Chris Rebert
6ec5b8cea8 retry each test up to 3 times in the event of timeout
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
2014-06-24 12:17:38 -07:00
XhmikosR
25ca51319b Turn off clean-css' advanced optimizations.
Works around #13914.

We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:

dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
2014-06-24 19:01:40 +03:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812.
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
2014-06-23 11:11:59 -07: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
4686d1483b Merge pull request #13829 from BBosman/preserve
Always use preserveComment: 'some'
2014-06-19 12:57:52 +03:00
Chris Rebert
f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert
85c15eec0f Gruntfile: add note about duplicate copy of jqueryCheck code
Refs #13842
2014-06-17 18:48:15 -07:00
Bas Bosman
3f68c40ac1 Make autoprefixer browsers fixed
Closes #13795 by merging it.
2014-06-17 11:56:16 -07:00
Bas Bosman
fdc33ced17 Always use preserveComment: 'some' 2014-06-15 16:41:53 +02:00
XhmikosR
89c0e4d2ab Update ZeroClipboard to v1.3.5.
Also use the official filenames.
2014-06-10 08:30:17 +03:00