Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-12-20 | Merge branch '2.2.3' into 3.0.0-wip | Mark Otto | |
Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/responsive.less less/type.less package.json | |||
2012-12-20 | remove inside support from tooltip + fix tooltip svg support + change ↵ | fat | |
makefile to rely on local npm install | |||
2012-12-11 | Version bump | Mark Otto | |
2012-12-01 | version bump to 3.0 | Mark Otto | |
2012-11-30 | Merge branch '2.2.2-wip' into exploratory | Mark Otto | |
Conflicts: docs/assets/css/bootstrap.css docs/components.html docs/templates/pages/components.mustache less/alerts.less less/button-groups.less less/buttons.less less/tests/css-tests.html | |||
2012-11-29 | Update Makefile | Kyle A. Matheny | |
Fixed both instances of uglifyjs usage. | |||
2012-11-06 | Merge branch '2.2.2-wip' into exploratory | Mark Otto | |
Conflicts: docs/assets/css/bootstrap.css less/navbar.less less/variables.less | |||
2012-11-05 | version bump | Mark Otto | |
2012-11-04 | Merge branch 'glyphicons_font' into exploratory | Mark Otto | |
Conflicts: docs/assets/css/bootstrap.css docs/assets/css/docs.css less/sprites.less | |||
2012-11-02 | Merge branch '2.2.2-wip' into exploratory | Mark Otto | |
Conflicts: docs/assets/css/bootstrap.css docs/getting-started.html docs/templates/pages/getting-started.mustache less/accordion.less less/alerts.less less/breadcrumbs.less less/buttons.less less/code.less less/dropdowns.less less/forms.less less/navbar.less less/progress-bars.less less/responsive-navbar.less less/tables.less less/thumbnails.less less/tooltip.less less/wells.less | |||
2012-11-02 | removing glyphicons images, swapping in new icon font with new classes | Mark Otto | |
2012-10-31 | 2.2.1 - hotfix for carousel | fat | |
2012-10-30 | Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip | fat | |
Conflicts: bootstrap/css/bootstrap.css bootstrap/css/bootstrap.min.css | |||
2012-10-30 | remove haunt, remove bootstrap dir, add bower support | fat | |
2012-10-30 | v2.2.0 instead of v2.1.2 | Mark Otto | |
2012-10-01 | single CSS file for all css, including responsive | Mark Otto | |
2012-09-05 | version bump to get this started | Mark Otto | |
2012-09-05 | Merge pull request #4810 from mainerror/2.1.1-wip | ♒∆✝ | |
Makefile misses a 'clean' directive | |||
2012-09-04 | fixes #4958: add version to minified js | Mark Otto | |
2012-08-29 | Added 'clean' directive to the make file. | Octavian Damiean | |
2012-08-21 | add affix to zip | Jacob Thornton | |
2012-08-15 | Add affix.js to javascript compilation | Mickael Perraud | |
2012-07-23 | change haunt to write | Jacob Thornton | |
2012-07-22 | add haunt w/ issue guideline spec | Jacob Thornton | |
2012-04-24 | Merge branch '2.0.3-wip' | Jacob Thornton | |
Conflicts: Makefile docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js | |||
2012-04-23 | hr to var in makefil | Jacob Thornton | |
2012-04-20 | run qunit tests in phantomjs for travis-ci | Jacob Thornton | |
2012-04-20 | make a few changes to package.json (add make test to makefile) | Jacob Thornton | |
2012-04-19 | make build prettier - hopefully this works, maybe some makefile bro's can ↵ | Jacob Thornton | |
improve | |||
2012-04-19 | make bootstrap compile with Recess instead of Less | Jacob Thornton | |
2012-04-16 | build bootstrap.js and bootstrap.min.js into docs | Jacob Thornton | |
2012-04-16 | add bootstrap + bootstrap.min.js to gh-pages for @remy | Jacob Thornton | |
2012-04-15 | add zip to git ignore, and fix gh-pages make | Jacob Thornton | |
2012-04-15 | simplify make - move zipping to gh-pages only | Jacob Thornton | |
2012-04-15 | change comments to preserve for yui | Jacob Thornton | |
2012-04-15 | change position of var in dropdown + cleanup makefile vars | Jacob Thornton | |
2012-04-15 | add jshint support + a few minor stylistic changes | Jacob Thornton | |
2012-04-08 | use yui-compress by default instead of regular compress | Mark Otto | |
2012-03-12 | Merge branch 'zerkms-master' into 2.0.2-wip | Mark Otto | |
Conflicts: Makefile | |||
2012-03-09 | Fixed double copy action in Makefile. | Jonathan Maron | |
2012-03-08 | remove non existent dist dir from phony makefil | Jacob Thornton | |
2012-03-08 | add version to min js | Jacob Thornton | |
2012-02-02 | fix makefile to reset zips | Jacob Thornton | |
2012-02-02 | fix the makefile | Mark Otto | |
2012-02-02 | only add the anyalytics to production | Jacob Thornton | |
2012-02-01 | move examples into docs...v2.0.0 | Jacob Thornton | |
2012-02-01 | add makefile to make it easier to publish to gh-pages... | Jacob Thornton | |
2012-02-01 | move js stuff into assets | Jacob Thornton | |
2012-01-30 | remove dist dir | Jacob Thornton | |
2012-01-30 | move building zip file into docs/makefile | Jacob Thornton | |