aboutsummaryrefslogtreecommitdiff
path: root/package.json
AgeCommit message (Collapse)AuthorFilesLines
2015-01-03Merge branch 'master' into v4Mark Otto1-1/+2
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
2014-12-30Merge pull request #15456 from twbs/bump-clean-cssChris Rebert1-1/+1
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-29bump grunt-jscs to ~1.1.0Chris Rebert1-1/+1
2014-12-29update devDependencies to match upstreamChris Rebert1-7/+7
2014-12-29bump grunt-jscs to ~1.1.0Chris Rebert1-1/+1
2014-12-28Bump grunt-contrib-cssmin to ~0.11.0Chris Rebert1-1/+1
2014-12-28bump grunt-contrib-uglify to ~0.7.0Chris Rebert1-1/+1
2014-12-28bump grunt-contrib-compress to ~0.13.0Chris Rebert1-1/+1
2014-12-28bump grunt-contrib-jade to ~0.14.0Chris Rebert1-1/+1
2014-12-28bump load-grunt-tasks to ~2.0.0Chris Rebert1-1/+1
2014-12-28bump remarkable to ~1.6.0Chris Rebert1-1/+1
2014-12-24Compile with Ruby Sass or libsass.Gleb Mazovetskiy1-0/+1
* 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-12bump grunt-saucelabs to ~8.4.0Chris Rebert1-1/+1
[skip validator]
2014-12-12bump remarkable to ~1.5.0Chris Rebert1-1/+1
2014-12-12use npm-shrinkwrap ^200.0.0 ; fixes #15279Chris Rebert1-1/+1
2014-12-09Merge pull request #15293 from twbs/grunt-contrib-compressXhmikosR1-0/+1
Add grunt-contrib-compress.
2014-12-09Update glob.XhmikosR1-1/+1
2014-12-09Add grunt-contrib-compress.XhmikosR1-0/+1
Now, the zip file is created when running `grunt prep-release`. [ci skip]
2014-12-08Travis: install scss-lintChris Rebert1-0/+1
2014-12-05Disable source commentsGleb Mazovetskiy1-1/+1
Require latest grunt-sass, bumped dep
2014-12-02bit of cleanupMark Otto1-1/+0
2014-12-02convert to scssMark Otto1-0/+1
2014-11-30Update devDependencies.XhmikosR1-5/+5
2014-11-13bump remarkable devDependency to ~1.4.1Chris Rebert1-1/+1
[skip sauce]
2014-11-13Pin npm-shrinkwrap to v5.0.0 so that it works with npm 2.x.XhmikosR1-1/+1
Fixes #15105.
2014-11-12bump version to v3.3.1v3.3.1Mark Otto1-1/+1
2014-11-12Update npm-shrinkwrap.XhmikosR1-1/+1
2014-11-10Update devDependencies.XhmikosR1-3/+3
2014-10-29Merge branch 'master' into v3.3.0Mark Otto1-1/+1
2014-10-29fixes #14911: bump dependencies to fix customizer text from being cut shorMark Otto1-1/+1
2014-10-29version bumpMark Otto1-1/+1
2014-10-26Replaces markdown.js with ↵jonschlinkert1-1/+1
[remarkable](https://github.com/jonschlinkert/remarkable). - remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html) - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark) - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
2014-10-25Merge pull request #13824 from jsdf/node-requirableMark Otto1-0/+1
Allow npm package to be resolved via node module resolution
2014-10-25Update node dependencies.XhmikosR1-2/+2
2014-10-23Update node dependencies.XhmikosR1-4/+4
2014-10-02Update grunt-contrib-jade versionDaijiro Wachi1-1/+1
2014-09-25Update dependencies.XhmikosR1-3/+3
Close #14664.
2014-09-08Update dependencies.XhmikosR1-3/+3
2014-08-30Update grunt-jscs.XhmikosR1-1/+1
2014-08-28Merge remote-tracking branch 'upstream/master' into node-requirableJames Friend1-21/+21
Conflicts: Gruntfile.js
2014-08-26Update dev dependencies.XhmikosR1-8/+8
2014-08-05bump grunt-autoprefixer to ~1.0.0Chris Rebert1-1/+1
2014-08-05added a separate npm-specific main fileJames Friend1-1/+1
2014-07-31bump grunt-saucelabs to ~8.2.0Chris Rebert1-1/+1
2014-07-31bump grunt-contrib-clean to ~0.6.0Chris Rebert1-1/+1
2014-07-22Update all devDependencies.XhmikosR1-4/+4
2014-07-22Update grunt-csscomb.XhmikosR1-1/+1
2014-07-10Update dependencies.XhmikosR1-2/+2
2014-07-06Update package.json.XhmikosR1-2/+2
* "grunt-jscs-checker" was renamed to "grunt-jscs" * update deps
2014-07-01Update dependencies.XhmikosR1-2/+2