aboutsummaryrefslogtreecommitdiff
path: root/Gruntfile.js
AgeCommit message (Collapse)AuthorFilesLines
2014-06-25Revert "Revert "Turn off clean-css' advanced optimizations.""XhmikosR1-1/+2
This reverts commit e31c2edf885efd42d2e755f189cc15125d977d70.
2014-06-24Revert "Turn off clean-css' advanced optimizations."Chris Rebert1-2/+1
This reverts commit 25ca51319b016bc4e42e1ba882d6f191e001d65d.
2014-06-24retry each test up to 3 times in the event of timeoutChris Rebert1-0/+1
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
2014-06-24Turn off clean-css' advanced optimizations.XhmikosR1-1/+2
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-23Revert UMD (#13772 & friends) for now, due to #13812.Chris Rebert1-1/+1
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 2b302f69eea416bc85e7827b7d7a74d49f879662. Revert "Fix regression of #10038 introduced by #13772" This reverts commit e9d6756a1ac76a9db31a41e8e03f663bedc41b70. Revert "MD/CommonJS/Globals #12909" This reverts commit 1c6fa9010daf0d0c21de9e20fe6ac4dba1788d90. Revert "address #13811" This reverts commit f347d7d955bbb17234b8e12c68efae7d516ce62c. Conflicts: js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tab.js js/tooltip.js
2014-06-19Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generationChris Rebert1-7/+16
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-19Merge pull request #13829 from BBosman/preserveXhmikosR1-9/+3
Always use preserveComment: 'some'
2014-06-17address #13811Chris Rebert1-1/+1
2014-06-17Gruntfile: add note about duplicate copy of jqueryCheck codeChris Rebert1-0/+1
Refs #13842
2014-06-17Make autoprefixer browsers fixedBas Bosman1-1/+10
Closes #13795 by merging it.
2014-06-15Always use preserveComment: 'some'Bas Bosman1-9/+3
2014-06-10Update ZeroClipboard to v1.3.5.XhmikosR1-1/+1
Also use the official filenames.
2014-06-10Refactor and restyle.Mark Otto1-1/+1
2014-06-10Integrate ZeroClipboard to easily copy code snippetssoundarapandian1-0/+1
2014-06-06Comply to the new style.XhmikosR1-4/+4
2014-06-06Tweak JSHint and JSCS checks.XhmikosR1-4/+3
Be more consistent across the whole codebase. Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
2014-05-19Reassigned minification of CSS to cssmin task.Robert Dodd1-10/+7
Reassigned minification of CSS files from the less task to the cssmin task
2014-05-18Gruntfile: skip steps when $TWBS_DO_*=0Chris Rebert1-2/+9
2014-05-18Gruntfile: extract runSubset() funcChris Rebert1-3/+7
2014-05-13remove update-shrinkwrap from the default Grunt taskChris Rebert1-1/+1
Most folks shouldn't care about the shrinkwrap. It should only be run on-demand, not as a routine/periodic thing.
2014-05-13Remove RTL leftovers.XhmikosR1-1/+0
2014-05-12unfuck the gruntifleMark Otto1-9/+9
2014-05-12no more concurrencyMark Otto1-7/+7
2014-05-12remove the commentMark Otto1-1/+1
2014-05-12nuke rtlMark Otto1-10/+1
2014-04-24add IE warning scripts to linter configChris Rebert1-1/+1
2014-03-28Add Gist & Customizer URLs to customized files & config.jsonChris Rebert1-0/+3
Fixes #9951 Fixes #12865
2014-03-27Gruntfile.js: Remove default `report` option.XhmikosR1-8/+3
2014-03-24Fix #13138: use underscore prefix to ignore directoriesZlatan Vasović1-16/+16
2014-03-17Add build-glyphicons-data logZlatan Vasović1-1/+1
Closes #12987
2014-03-17pass grunt into generateRawFilesJs instead of require()ing itChris Rebert1-1/+1
2014-03-16Update gruntfile to point to new customizer nav, run gruntMark Otto1-1/+1
2014-03-16move sauce_browsers.yml into /grunt/; fixes #13065Chris Rebert1-1/+1
2014-03-12upgrade to grunt-css-flip v0.2.0Chris Rebert1-2/+2
2014-03-12Gruntfile.js: fix path after d08bbdc6ec50baca9e34d2aa6e8bcfc8d6135217.XhmikosR1-1/+1
2014-03-11Simplify tasks a little bit.XhmikosR1-27/+17
2014-03-11Run usebanner before cssmin.XhmikosR1-1/+1
2014-03-10Merge pull request #12977 from ZDroid/varXhmikosR1-2/+2
Rename generateRawFilesJs to generateRawFiles
2014-03-09Fix bad grunt merge and then G R U N TMark Otto1-1/+1
2014-03-09Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-2/+2
Conflicts: Gruntfile.js
2014-03-09Reorder the Gruntfile a bitMark Otto1-27/+27
2014-03-09Remove unneeded quotes.XhmikosR1-3/+3
2014-03-08Rename generateRawFilesJs to generateRawFilesZlatan Vasović1-2/+2
2014-03-07Merge pull request #12505 from ZDroid/js-cs-hintChris Rebert1-8/+8
Reorganize docs assets
2014-03-07Reorganize docs assetsZlatan Vasović1-8/+8
2014-03-07Do csscomb earlier in build phaseBas Bosman1-1/+1
2014-03-07Add autoprefixerBas Bosman1-1/+28
2014-03-07Add time-grunt plugin.XhmikosR1-0/+1
2014-03-06re-enable requireCamelCaseOrUpperCaseIdentifiers in JSCS & use `null` to ↵Chris Rebert1-0/+1
override it for Gruntfile
2014-03-06switch to grunt-css-flip for RTL CSS generationChris Rebert1-3/+2