]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Môshe van der Sterre [Fri, 27 Dec 2013 20:27:51 +0000 (21:27 +0100)]
Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.
fat [Fri, 27 Dec 2013 04:33:44 +0000 (20:33 -0800)]
update accordion-group to panel
fat [Fri, 27 Dec 2013 04:26:27 +0000 (20:26 -0800)]
fixes #10911 - add loading event for use with remote option :|
fat [Fri, 27 Dec 2013 03:40:41 +0000 (19:40 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
fat [Fri, 27 Dec 2013 03:40:18 +0000 (19:40 -0800)]
fixes #10890
Mark Otto [Fri, 27 Dec 2013 03:37:19 +0000 (19:37 -0800)]
less fun to address #12008
Mark Otto [Fri, 27 Dec 2013 03:08:34 +0000 (19:08 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 27 Dec 2013 03:08:19 +0000 (19:08 -0800)]
Fixes #12012: Use correct banner in docs js
fat [Fri, 27 Dec 2013 02:30:16 +0000 (18:30 -0800)]
rebuild
fat [Fri, 27 Dec 2013 02:27:43 +0000 (18:27 -0800)]
update tool/pop destroy placement
Jacob [Fri, 27 Dec 2013 02:25:29 +0000 (18:25 -0800)]
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
don't create new Tooltip/Popover objects just to destroy them immediately
fat [Fri, 27 Dec 2013 02:18:53 +0000 (18:18 -0800)]
nope
Jacob [Fri, 27 Dec 2013 02:18:09 +0000 (18:18 -0800)]
Merge pull request #11496 from satazor/patch-1
Clear timeout on destroy.
fat [Fri, 27 Dec 2013 01:53:31 +0000 (17:53 -0800)]
fixes #10798
Jacob [Fri, 27 Dec 2013 01:50:41 +0000 (17:50 -0800)]
Merge pull request #10801 from Travesty3/master
Add 'collapse' class back after expanding
Jacob [Fri, 27 Dec 2013 01:46:59 +0000 (17:46 -0800)]
Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
Chris Rebert [Thu, 26 Dec 2013 21:44:27 +0000 (13:44 -0800)]
add Python indentation style to editorconfig; refs #12023
Chris Rebert [Thu, 26 Dec 2013 21:28:22 +0000 (13:28 -0800)]
Merge pull request #12009 from ZDroid/no-utf8-py
Replace UTF-8 characters in s3_cache.py with ASCII characters
Chris Rebert [Thu, 26 Dec 2013 21:16:13 +0000 (13:16 -0800)]
Merge pull request #12022 from ZDroid/update-deps
Update dependencies
Zlatan Vasović [Thu, 26 Dec 2013 20:55:55 +0000 (21:55 +0100)]
Update dependencies
Updates grunt-html-validation and grunt-jekyll dependencies.
Mark Otto [Thu, 26 Dec 2013 20:54:23 +0000 (12:54 -0800)]
Merge pull request #12010 from ZDroid/wrong-indent
Fix wrong indent in .jscs.json
Chris Rebert [Thu, 26 Dec 2013 20:32:34 +0000 (12:32 -0800)]
Merge pull request #12021 from XhmikosR/master
Add docs-assets/css/docs.css to csslint too.
Julian Thilo [Thu, 26 Dec 2013 18:58:23 +0000 (10:58 -0800)]
Merge pull request #12019 from XhmikosR/badge
Change david-dm theme to make README badges uniform
Chris Rebert [Thu, 26 Dec 2013 18:52:38 +0000 (10:52 -0800)]
Merge pull request #12020 from XhmikosR/package
Update dependencies.
XhmikosR [Thu, 26 Dec 2013 17:50:04 +0000 (19:50 +0200)]
Update dependencies.
XhmikosR [Thu, 26 Dec 2013 17:51:10 +0000 (19:51 +0200)]
README.md: switch to the shields.io dependency badges theme.
XhmikosR [Tue, 10 Dec 2013 14:11:08 +0000 (16:11 +0200)]
Add docs-assets/css/docs.css to csslint too.
fat [Thu, 26 Dec 2013 04:33:05 +0000 (20:33 -0800)]
fixes #10675
fat [Thu, 26 Dec 2013 04:04:49 +0000 (20:04 -0800)]
build js
fat [Thu, 26 Dec 2013 04:03:28 +0000 (20:03 -0800)]
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
Conflicts:
js/tooltip.js
Zlatan Vasović [Wed, 25 Dec 2013 19:22:52 +0000 (20:22 +0100)]
Fix wrong indent in .jscs.json
Zlatan Vasović [Wed, 25 Dec 2013 19:19:59 +0000 (20:19 +0100)]
Replace UTF-8 characters in s3_cache.py with ASCII characters
fat [Wed, 25 Dec 2013 01:00:55 +0000 (17:00 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
fat [Wed, 25 Dec 2013 01:00:34 +0000 (17:00 -0800)]
fixes #11788 - focusin focusout instead of focus/blur
Jacob [Wed, 25 Dec 2013 00:43:24 +0000 (16:43 -0800)]
Merge pull request #11722 from DocX/patch-1
Use document scroll height instead of offset height
fat [Wed, 25 Dec 2013 00:37:53 +0000 (16:37 -0800)]
add docs for affix events
fat [Wed, 25 Dec 2013 00:29:51 +0000 (16:29 -0800)]
fixes #11720 - Add events trigger to affix
fat [Tue, 24 Dec 2013 21:43:47 +0000 (13:43 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
fat [Tue, 24 Dec 2013 21:43:09 +0000 (13:43 -0800)]
note for #10486 add note about data-toggle dropdown dependency
Jacob [Tue, 24 Dec 2013 21:21:19 +0000 (13:21 -0800)]
Merge pull request #10359 from ixti/patch-1
Pass $element to offset top/bottom calc funcs
fat [Tue, 24 Dec 2013 21:07:42 +0000 (13:07 -0800)]
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
fat [Tue, 24 Dec 2013 20:50:55 +0000 (12:50 -0800)]
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
js/tests/unit/carousel.js
fat [Tue, 24 Dec 2013 20:40:24 +0000 (12:40 -0800)]
fixes #10283
fat [Tue, 24 Dec 2013 20:35:24 +0000 (12:35 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
fat [Tue, 24 Dec 2013 20:32:06 +0000 (12:32 -0800)]
fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
Mark Otto [Tue, 24 Dec 2013 20:24:07 +0000 (12:24 -0800)]
Merge pull request #12001 from soundarapandian/fix_typo_contributing
Use correct directory name for bootstrap contribution
Mark Otto [Tue, 24 Dec 2013 20:18:53 +0000 (12:18 -0800)]
don't roll back that comment
Mark Otto [Tue, 24 Dec 2013 20:17:48 +0000 (12:17 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
docs-assets/js/raw-files.js
Mark Otto [Tue, 24 Dec 2013 20:16:17 +0000 (12:16 -0800)]
roll back version numbers to avoid broken links in docs and readme (fixes #12000)
Gleb Mazovetskiy [Tue, 24 Dec 2013 16:20:52 +0000 (17:20 +0100)]
Reflect sass readme change in css.html
soundarapandian [Tue, 24 Dec 2013 10:35:19 +0000 (16:05 +0530)]
Use correct directory name for bootstrap contribution
Jacob [Tue, 24 Dec 2013 07:31:11 +0000 (23:31 -0800)]
Merge pull request #11933 from twbs/fat-10105
change where modal loads content -– fixes #10105, #9318, #9459
fat [Thu, 19 Dec 2013 05:38:35 +0000 (21:38 -0800)]
change where modal loads content -– fixes #10105, #9318, #9459
Mark Otto [Tue, 24 Dec 2013 07:26:05 +0000 (23:26 -0800)]
Merge pull request #11999 from XhmikosR/respond.js
Update Respond.js
XhmikosR [Mon, 23 Dec 2013 17:23:07 +0000 (19:23 +0200)]
Update Respond.js to v1.4.2.
fat [Tue, 24 Dec 2013 06:57:39 +0000 (22:57 -0800)]
fixes #10568 - kill hoverstate info once command has been executed
fat [Tue, 24 Dec 2013 06:08:43 +0000 (22:08 -0800)]
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
Mark Otto [Tue, 24 Dec 2013 04:28:21 +0000 (20:28 -0800)]
add callout about justified button group borders to address #11964
Mark Otto [Tue, 24 Dec 2013 02:53:30 +0000 (18:53 -0800)]
Merge pull request #11970 from supergibbs/Better_10492_fix
Fixes #10492 better
Supergibbs [Tue, 24 Dec 2013 00:07:55 +0000 (16:07 -0800)]
Fixes #10492 better:
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
Mark Otto [Mon, 23 Dec 2013 23:16:25 +0000 (15:16 -0800)]
Fixes #11975: Change from png to .ico for favicon
Mark Otto [Mon, 23 Dec 2013 21:26:01 +0000 (13:26 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 21:25:51 +0000 (13:25 -0800)]
Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
Mark Otto [Mon, 23 Dec 2013 20:42:41 +0000 (12:42 -0800)]
Merge pull request #11989 from ZDroid/banner
Improve banner
Zlatan Vasović [Mon, 23 Dec 2013 17:02:42 +0000 (18:02 +0100)]
Improve banner
Mark Otto [Mon, 23 Dec 2013 07:15:35 +0000 (23:15 -0800)]
Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
Jekyll: exclude more files/folders.
Mark Otto [Mon, 23 Dec 2013 06:32:35 +0000 (22:32 -0800)]
grunt
Mark Otto [Mon, 23 Dec 2013 06:31:28 +0000 (22:31 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 06:31:13 +0000 (22:31 -0800)]
Fixes #10492 and some of #11970: round the proper corner on table cells in panels
Mark Otto [Mon, 23 Dec 2013 06:20:23 +0000 (22:20 -0800)]
Merge pull request #11974 from XhmikosR/meta
Normalize meta
Mark Otto [Mon, 23 Dec 2013 06:08:33 +0000 (22:08 -0800)]
Merge pull request #11972 from XhmikosR/comma
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
Mark Otto [Mon, 23 Dec 2013 06:07:01 +0000 (22:07 -0800)]
fixes #11961: dropdown alignment docs improvements
Mark Otto [Mon, 23 Dec 2013 05:47:11 +0000 (21:47 -0800)]
Merge pull request #11963 from twbs/sass_docs
Add docs for Sass port
Mark Otto [Mon, 23 Dec 2013 05:42:08 +0000 (21:42 -0800)]
space
Mark Otto [Mon, 23 Dec 2013 05:27:12 +0000 (21:27 -0800)]
add what's included
Mark Otto [Mon, 23 Dec 2013 05:23:24 +0000 (21:23 -0800)]
Merge branch 'master' into sass_docs
Mark Otto [Mon, 23 Dec 2013 05:18:45 +0000 (21:18 -0800)]
Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS
Mark Otto [Mon, 23 Dec 2013 05:05:08 +0000 (21:05 -0800)]
Remove timestamp on generated Glyhpicons
Mark Otto [Mon, 23 Dec 2013 05:01:00 +0000 (21:01 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 23 Dec 2013 05:00:53 +0000 (21:00 -0800)]
grunt
Mark Otto [Mon, 23 Dec 2013 01:30:35 +0000 (17:30 -0800)]
Merge pull request #11979 from ZDroid/fix-old-links
Fix old links
Chris Rebert [Sun, 22 Dec 2013 20:23:52 +0000 (12:23 -0800)]
Merge pull request #11982 from ZDroid/update-deps
Update dependencies
Zlatan Vasović [Sun, 22 Dec 2013 18:01:00 +0000 (19:01 +0100)]
Update dependencies
Zlatan Vasović [Sun, 22 Dec 2013 15:26:05 +0000 (16:26 +0100)]
Fix old links
Replace recess with less.
XhmikosR [Sun, 22 Dec 2013 09:45:18 +0000 (11:45 +0200)]
Jekyll: exclude more files/folders.
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
XhmikosR [Sat, 21 Dec 2013 20:59:40 +0000 (22:59 +0200)]
Get rid of JSHint's `laxcomma` option now that the comma is used on the right side.
XhmikosR [Tue, 17 Dec 2013 12:41:15 +0000 (14:41 +0200)]
bower.json: sort by name.
XhmikosR [Tue, 17 Dec 2013 12:39:36 +0000 (14:39 +0200)]
Normalize package.json.
XhmikosR [Mon, 16 Dec 2013 09:36:31 +0000 (11:36 +0200)]
js/.jscs.json: sort by name.
Mark Otto [Sat, 21 Dec 2013 18:36:20 +0000 (10:36 -0800)]
add section for contents
Mark Otto [Sat, 21 Dec 2013 18:09:39 +0000 (10:09 -0800)]
config url
Mark Otto [Sat, 21 Dec 2013 18:08:04 +0000 (10:08 -0800)]
Team members on About page
Mark Otto [Sat, 21 Dec 2013 17:59:24 +0000 (09:59 -0800)]
remove some unintional code
Mark Otto [Sat, 21 Dec 2013 17:45:47 +0000 (09:45 -0800)]
Merge branch 'master' into sass_docs
Mark Otto [Sat, 21 Dec 2013 17:36:51 +0000 (09:36 -0800)]
readme typo from #11965
Mark Otto [Sat, 21 Dec 2013 17:36:18 +0000 (09:36 -0800)]
Merge pull request #11965 from tomByrer/md-tweaks
condenced README CONTRIB changes
tomByrer [Sat, 21 Dec 2013 16:39:34 +0000 (09:39 -0700)]
https://github.com/twbs/bootstrap/pull/11950#issuecomment-
31033824
Mark Otto [Sat, 21 Dec 2013 05:19:45 +0000 (21:19 -0800)]
more Less
Mark Otto [Sat, 21 Dec 2013 05:02:25 +0000 (21:02 -0800)]
Sass docs; LESS to Less because fuck caps
Mark Otto [Fri, 20 Dec 2013 20:29:49 +0000 (12:29 -0800)]
Merge pull request #11956 from tlindig/tl_pagination_customizing
add new variables for "pagination" to improve support of customizing