]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Fri, 10 Jan 2014 02:05:04 +0000 (18:05 -0800)] 
more derp
Mark Otto [Mon, 6 Jan 2014 17:26:08 +0000 (09:26 -0800)]
justify text
Mark Otto [Mon, 6 Jan 2014 07:43:13 +0000 (23:43 -0800)]
link
Mark Otto [Mon, 6 Jan 2014 07:36:57 +0000 (23:36 -0800)]
Move homepage examples to data file
Mark Otto [Mon, 6 Jan 2014 07:23:55 +0000 (23:23 -0800)]
Merge branch 'master' into docs_derp
Conflicts:
docs/_layouts/default.html
docs/_layouts/home.html
Mark Otto [Mon, 6 Jan 2014 07:21:11 +0000 (23:21 -0800)] 
Merge pull request #12107 from twbs/same-footer-links
harmonize footer links on homepage & docs pages
Mark Otto [Mon, 6 Jan 2014 07:19:34 +0000 (23:19 -0800)]
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
Chris Rebert [Mon, 6 Jan 2014 06:54:01 +0000 (22:54 -0800)] 
Merge pull request #12118 from wangsai/fix-out-container
fix the paragraph outside of '.bs-docs-section'
wangsai [Mon, 6 Jan 2014 06:39:09 +0000 (14:39 +0800)] 
fix the paragraph outside of '.bs-docs-section'
Mark Otto [Mon, 6 Jan 2014 04:54:31 +0000 (20:54 -0800)]
grammarghhhhhhhhhhhh
Mark Otto [Mon, 6 Jan 2014 04:53:40 +0000 (20:53 -0800)]
copy
Chris Rebert [Mon, 6 Jan 2014 04:52:37 +0000 (20:52 -0800)] 
add /docs/assets JS to JSCS Grunt task config
Mark Otto [Mon, 6 Jan 2014 04:16:17 +0000 (20:16 -0800)]
Merge pull request #12115 from Quy/master
Delete reference to a non-existent class
Quy Ton [Mon, 6 Jan 2014 04:08:37 +0000 (20:08 -0800)] 
Delete reference to a non-existent class
Chris Rebert [Mon, 6 Jan 2014 02:06:55 +0000 (18:06 -0800)]
Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
Use $ instead of jQuery
Mark Otto [Mon, 6 Jan 2014 01:50:07 +0000 (17:50 -0800)]
Merge branch 'master' into docs_derp
Mark Otto [Mon, 6 Jan 2014 01:49:40 +0000 (17:49 -0800)]
Merge branch 'master' into docs_derp
Mark Otto [Sun, 5 Jan 2014 23:57:33 +0000 (15:57 -0800)]
Merge pull request #12110 from twbs/one-control-per-input-group
document single .form-control per .input-group limitation
Chris Rebert [Sun, 5 Jan 2014 22:44:48 +0000 (14:44 -0800)]
document single .form-control per .input-group limitation; fixes #12109
Chris Rebert [Sun, 5 Jan 2014 21:45:56 +0000 (13:45 -0800)]
harmonize footer links on homepage & docs pages
Mark Otto [Sun, 5 Jan 2014 21:26:15 +0000 (13:26 -0800)]
Use mix of medium and small grid clases on dashboard example
Mark Otto [Sun, 5 Jan 2014 21:19:49 +0000 (13:19 -0800)]
Merge pull request #12105 from twbs/navbar-containers
add .container(-fluid) to remaining navbar examples
Chris Rebert [Sun, 5 Jan 2014 20:55:03 +0000 (12:55 -0800)]
add .container(-fluid) to remaining navbar examples for consistency/accuracy
follow-up to
93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf
Chris Rebert [Sun, 5 Jan 2014 19:47:00 +0000 (11:47 -0800)]
Merge pull request #12104 from ghoullier/master
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
Gregory HOULLIER [Sun, 5 Jan 2014 19:15:48 +0000 (20:15 +0100)] 
Replace getElementsByTag by querySelector for IE10 Mobile plateform.
Chris Rebert [Sun, 5 Jan 2014 16:52:16 +0000 (08:52 -0800)]
Merge pull request #12099 from Quy/master
Fix typos
Quy Ton [Sun, 5 Jan 2014 16:38:32 +0000 (08:38 -0800)]
Fix typos
Chris Rebert [Sun, 5 Jan 2014 16:05:40 +0000 (08:05 -0800)]
Merge pull request #12098 from ZDroid/reorg
Group repo vars together in Jekyll config
Chris Rebert [Sun, 5 Jan 2014 16:01:55 +0000 (08:01 -0800)]
Merge pull request #12097 from ZDroid/deprecated
Replace @screen-sm with @screen-sm-min
Zlatan Vasović [Sun, 5 Jan 2014 10:51:49 +0000 (11:51 +0100)] 
Reorganize vars
Zlatan Vasović [Sun, 5 Jan 2014 10:38:26 +0000 (11:38 +0100)]
Replace @screen-sm with @screen-sm-min
Chris Rebert [Sun, 5 Jan 2014 05:43:25 +0000 (21:43 -0800)]
Merge pull request #12095 from Quy/master
Fix typo
Quy Ton [Sun, 5 Jan 2014 05:35:06 +0000 (21:35 -0800)]
Fix typo
Mark Otto [Sun, 5 Jan 2014 03:31:52 +0000 (19:31 -0800)]
Merge pull request #12092 from Quy/master
Use relative URLs and fix anchor links
Chris Rebert [Sat, 4 Jan 2014 20:20:38 +0000 (12:20 -0800)]
Merge pull request #12090 from nschonni/patch-2
Quote Node 0.10 so correct version is printed
Quy Ton [Sat, 4 Jan 2014 17:28:56 +0000 (09:28 -0800)]
Fix anchor links
Quy Ton [Sat, 4 Jan 2014 17:10:02 +0000 (09:10 -0800)]
Use relative URLs
Nick Schonning [Sat, 4 Jan 2014 15:46:05 +0000 (10:46 -0500)] 
Quote Node 0.10 so correct version is printed
Chris Rebert [Sat, 4 Jan 2014 00:19:20 +0000 (16:19 -0800)]
Replace lingering page.url instance with site.baseurl
Refs #12083 & #12037
Kevin Sawicki [Fri, 3 Jan 2014 22:37:03 +0000 (14:37 -0800)] 
Use $ instead of jQuery
Mark Otto [Fri, 3 Jan 2014 21:18:12 +0000 (13:18 -0800)]
Merge branch 'master' into docs_derp
Chris Rebert [Fri, 3 Jan 2014 20:29:45 +0000 (12:29 -0800)]
flip order so sentence reads better
Chris Rebert [Fri, 3 Jan 2014 20:21:38 +0000 (12:21 -0800)]
de-emphasize /docs/assets and docs HTML now that they're outside of the root dir
Chris Rebert [Fri, 3 Jan 2014 20:14:20 +0000 (12:14 -0800)]
Merge pull request #12081 from Quy/master
Update source code download structure
Quy Ton [Fri, 3 Jan 2014 19:42:27 +0000 (11:42 -0800)]
Update source code download structure
Julian Thilo [Fri, 3 Jan 2014 19:04:14 +0000 (11:04 -0800)] 
Merge pull request #12080 from Quy/master
Refer to popovers instead of tooltips.
Quy Ton [Fri, 3 Jan 2014 18:55:06 +0000 (10:55 -0800)]
Refer to popovers instead of tooltips.
Mark Otto [Thu, 2 Jan 2014 18:54:10 +0000 (10:54 -0800)]
updates to homepage
Mark Otto [Thu, 2 Jan 2014 18:52:43 +0000 (10:52 -0800)]
Merge pull request #12063 from ZDroid/tc
Drop trailling comma
Zlatan Vasović [Thu, 2 Jan 2014 14:46:13 +0000 (15:46 +0100)]
Drop trailling comma
No need for it.
Mark Otto [Wed, 1 Jan 2014 20:27:09 +0000 (12:27 -0800)]
Merge branch 'master' into docs_derp
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
Mark Otto [Wed, 1 Jan 2014 20:02:28 +0000 (12:02 -0800)]
Merge pull request #12055 from wangsai/fix-assets-links-of-examples
fix assets links in all examples
Julian Thilo [Wed, 1 Jan 2014 17:45:50 +0000 (09:45 -0800)]
Merge pull request #12056 from ZDroid/ny
New Year
Zlatan Vasović [Wed, 1 Jan 2014 14:37:08 +0000 (15:37 +0100)]
New Year
wangsai [Wed, 1 Jan 2014 14:29:13 +0000 (22:29 +0800)]
fix assets links in all examples
Mark Otto [Wed, 1 Jan 2014 02:21:41 +0000 (18:21 -0800)]
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state
Mark Otto [Wed, 1 Jan 2014 01:47:16 +0000 (17:47 -0800)]
Fix broken JS
Mark Otto [Tue, 31 Dec 2013 21:57:43 +0000 (13:57 -0800)]
Merge branch 'master' into docs_derp
Mark Otto [Tue, 31 Dec 2013 21:57:35 +0000 (13:57 -0800)]
derp
Mark Otto [Tue, 31 Dec 2013 21:56:20 +0000 (13:56 -0800)]
fix homepage images
Mark Otto [Tue, 31 Dec 2013 21:53:33 +0000 (13:53 -0800)]
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
Mark Otto [Tue, 31 Dec 2013 21:43:32 +0000 (13:43 -0800)]
Merge pull request #12037 from twbs/docs_dir
Bring back the `/docs` directory
Mark Otto [Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)]
Merge branch 'master' into docs_dir
Mark Otto [Tue, 31 Dec 2013 21:16:28 +0000 (13:16 -0800)]
Fixes #12046: move .csscomb.json and .csslintrc to less/ folder
Mark Otto [Tue, 31 Dec 2013 20:57:55 +0000 (12:57 -0800)]
Merge pull request #12049 from ZDroid/update-de
Update dependencies (again)
Mark Otto [Tue, 31 Dec 2013 19:57:44 +0000 (11:57 -0800)]
typo
Mark Otto [Tue, 31 Dec 2013 19:38:32 +0000 (11:38 -0800)]
@nschonni's feedback <3
Mark Otto [Tue, 31 Dec 2013 18:51:39 +0000 (10:51 -0800)]
@cvrebert's feedback
Mark Otto [Tue, 31 Dec 2013 18:38:31 +0000 (10:38 -0800)]
Merge branch 'master' into docs_dir
Zlatan Vasović [Tue, 31 Dec 2013 18:20:57 +0000 (19:20 +0100)]
Update dependencies (again)
Chris Rebert [Mon, 30 Dec 2013 07:26:57 +0000 (23:26 -0800)]
Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html
Fixed typo
Supergibbs [Mon, 30 Dec 2013 07:16:41 +0000 (23:16 -0800)] 
Fixed typo
Chris Rebert [Mon, 30 Dec 2013 05:15:29 +0000 (21:15 -0800)]
Sauce now supports latest Firefox on OS X Mavericks
Chris Rebert [Mon, 30 Dec 2013 05:13:56 +0000 (21:13 -0800)]
default to latest Firefox version on OS X
Chris Rebert [Mon, 30 Dec 2013 04:45:36 +0000 (20:45 -0800)]
fix capitalization of iOS
Chris Rebert [Mon, 30 Dec 2013 04:29:44 +0000 (20:29 -0800)]
Merge pull request #12041 from twbs/mv-sauce-into-infra
mv sauce_browsers.yml out of the project root
Chris Rebert [Mon, 30 Dec 2013 04:25:40 +0000 (20:25 -0800)]
mv sauce_browsers.yml out of the project root
fat [Mon, 30 Dec 2013 03:40:31 +0000 (19:40 -0800)] 
add note about ios dropdown compat
fat [Mon, 30 Dec 2013 03:25:24 +0000 (19:25 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Chris Rebert [Mon, 30 Dec 2013 03:23:57 +0000 (19:23 -0800)]
Merge pull request #12036 from ZDroid/grunt-fs-minify
Merge two fs variable declarations into one
fat [Mon, 30 Dec 2013 03:23:15 +0000 (19:23 -0800)]
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
Conflicts:
js/dropdown.js
fat [Mon, 30 Dec 2013 03:01:32 +0000 (19:01 -0800)]
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
fat [Mon, 30 Dec 2013 02:57:22 +0000 (18:57 -0800)]
fixes #11373 - adds related target to dropdown events
fat [Mon, 30 Dec 2013 02:04:43 +0000 (18:04 -0800)]
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
Conflicts:
dist/js/bootstrap.min.js
fat [Mon, 30 Dec 2013 01:54:40 +0000 (17:54 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
fat [Mon, 30 Dec 2013 01:53:59 +0000 (17:53 -0800)]
fixes #11288 - Vertical scroll position of modal saves between openings
Mark Otto [Sun, 29 Dec 2013 07:08:46 +0000 (23:08 -0800)]
no more page.base_url
Mark Otto [Sun, 29 Dec 2013 07:05:02 +0000 (23:05 -0800)]
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones
Mark Otto [Sun, 29 Dec 2013 06:47:03 +0000 (22:47 -0800)]
Rearrange repository contents because muahahahahahaha
Jacob [Sun, 29 Dec 2013 06:06:26 +0000 (22:06 -0800)]
Merge pull request #11203 from jasny/patch-1
Scrollspy acting up when targets are hidden
fat [Sun, 29 Dec 2013 04:59:45 +0000 (20:59 -0800)]
fixes #10658 jQuery Popover content loses bound events on second setContent call.
Mark Otto [Sun, 29 Dec 2013 02:47:32 +0000 (18:47 -0800)]
drop the title
Mark Otto [Sun, 29 Dec 2013 02:46:36 +0000 (18:46 -0800)]
Merge pull request #12035 from tomByrer/master
fixed .clearfix example, + doc link
Zlatan Vasović [Sat, 28 Dec 2013 22:33:32 +0000 (23:33 +0100)]
Merge two fs variable declarations into one
One is enough.
tomByrer [Sat, 28 Dec 2013 19:01:32 +0000 (12:01 -0700)] 
fixed .clearfix example, + doc link
Mark Otto [Sat, 28 Dec 2013 00:44:00 +0000 (16:44 -0800)]
spacing
Mark Otto [Sat, 28 Dec 2013 00:41:33 +0000 (16:41 -0800)]
Merge branch 'master' into docs_derp
Mark Otto [Sat, 28 Dec 2013 00:41:25 +0000 (16:41 -0800)]
grunt on last merge
Mark Otto [Fri, 27 Dec 2013 22:04:44 +0000 (14:04 -0800)]
big brand update
Mark Otto [Fri, 27 Dec 2013 20:40:02 +0000 (12:40 -0800)]
Merge pull request #12028 from moshevds/deprecated-screen-md
Small fix: I noticed the use of a deprecated variable.
projects / thirdparty / bootstrap.git / log
