aboutsummaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2013-01-13Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto1-8/+35
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/components.html docs/css.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/extend.mustache docs/templates/pages/getting-started.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/buttons.less less/forms.less less/navbar.less less/popovers.less less/responsive-767px-max.less less/responsive.less less/tables.less less/tooltip.less less/type.less less/variables.less package.json
2012-12-22Version bumpMark Otto1-1/+1
2012-12-21rewrite makefile to make a bit more "efficient" + rebuildfat1-9/+34
2012-12-20Merge branch '2.2.3' into 3.0.0-wipMark Otto1-8/+8
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-19remove inside support from tooltip + fix tooltip svg support + change ↵fat1-10/+10
makefile to rely on local npm install
2012-12-10Version bumpMark Otto1-1/+1
2012-11-30version bump to 3.0Mark Otto1-1/+1
2012-11-30Merge branch '2.2.2-wip' into exploratoryMark Otto1-2/+2
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-28Update MakefileKyle A. Matheny1-2/+2
Fixed both instances of uglifyjs usage.
2012-11-05Merge branch '2.2.2-wip' into exploratoryMark Otto1-1/+1
Conflicts: docs/assets/css/bootstrap.css less/navbar.less less/variables.less
2012-11-05version bumpMark Otto1-1/+1
2012-11-03Merge branch 'glyphicons_font' into exploratoryMark Otto1-3/+3
Conflicts: docs/assets/css/bootstrap.css docs/assets/css/docs.css less/sprites.less
2012-11-02Merge branch '2.2.2-wip' into exploratoryMark Otto1-8/+1
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-02removing glyphicons images, swapping in new icon font with new classesMark Otto1-3/+3
2012-10-302.2.1 - hotfix for carouselfat1-1/+1
2012-10-29Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wipfat1-1/+1
Conflicts: bootstrap/css/bootstrap.css bootstrap/css/bootstrap.min.css
2012-10-29remove haunt, remove bootstrap dir, add bower supportfat1-7/+0
2012-10-29v2.2.0 instead of v2.1.2Mark Otto1-1/+1
2012-09-30single CSS file for all css, including responsiveMark Otto1-5/+0
2012-09-05version bump to get this startedMark Otto1-1/+1
2012-09-04Merge pull request #4810 from mainerror/2.1.1-wip♒∆✝1-0/+7
Makefile misses a 'clean' directive
2012-09-04fixes #4958: add version to minified jsMark Otto1-1/+1
2012-08-29Added 'clean' directive to the make file.Octavian Damiean1-0/+7
2012-08-20add affix to zipJacob Thornton1-1/+1
2012-08-15Add affix.js to javascript compilationMickael Perraud1-1/+1
2012-07-22change haunt to writeJacob Thornton1-1/+1
2012-07-22add haunt w/ issue guideline specJacob Thornton1-0/+7
2012-04-24Merge branch '2.0.3-wip'Jacob Thornton1-22/+53
Conflicts: Makefile docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js
2012-04-23hr to var in makefilJacob Thornton1-4/+5
2012-04-19run qunit tests in phantomjs for travis-ciJacob Thornton1-2/+6
2012-04-19make a few changes to package.json (add make test to makefile)Jacob Thornton1-0/+8
2012-04-18make build prettier - hopefully this works, maybe some makefile bro's can ↵Jacob Thornton1-14/+29
improve
2012-04-18make bootstrap compile with Recess instead of LessJacob Thornton1-7/+7
2012-04-15build bootstrap.js and bootstrap.min.js into docsJacob Thornton1-0/+5
2012-04-15add bootstrap + bootstrap.min.js to gh-pages for @remyJacob Thornton1-0/+2
2012-04-15add zip to git ignore, and fix gh-pages makeJacob Thornton1-1/+1
2012-04-15simplify make - move zipping to gh-pages onlyJacob Thornton1-7/+7
2012-04-14change comments to preserve for yuiJacob Thornton1-1/+1
2012-04-14change position of var in dropdown + cleanup makefile varsJacob Thornton1-2/+0
2012-04-14add jshint support + a few minor stylistic changesJacob Thornton1-0/+2
2012-04-07use yui-compress by default instead of regular compressMark Otto1-2/+2
2012-03-11Merge branch 'zerkms-master' into 2.0.2-wipMark Otto1-2/+1
Conflicts: Makefile
2012-03-09Fixed double copy action in Makefile.Jonathan Maron1-2/+1
2012-03-08remove non existent dist dir from phony makefilJacob Thornton1-1/+1
2012-03-08add version to min jsJacob Thornton1-1/+4
2012-02-01fix makefile to reset zipsJacob Thornton1-0/+2
2012-02-01fix the makefileMark Otto1-2/+2
2012-02-01only add the anyalytics to productionJacob Thornton1-2/+7
2012-01-31move examples into docs...v2.0.0Jacob Thornton1-0/+1
2012-01-31add makefile to make it easier to publish to gh-pages...Jacob Thornton1-1/+4