Mark Otto
|
2aa1a4dc70
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-07 22:18:53 -08:00 |
|
Yohn
|
beb60309d1
|
dont remove title attribute part 2
|
2013-02-06 06:17:48 -05:00 |
|
Mark Otto
|
421f9f67c4
|
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
|
2013-02-05 22:42:54 -08:00 |
|
fat
|
3b56227553
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
|
2013-02-05 22:30:54 -08:00 |
|
fat
|
4814281540
|
clean up styles
|
2013-02-05 22:29:59 -08:00 |
|
fat
|
5e4db94c24
|
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
|
2013-02-05 22:10:41 -08:00 |
|
fat-kun
|
6a9cd513c0
|
Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
|
2013-02-05 21:48:34 -08:00 |
|
Joseph Price
|
1fe4ed8823
|
reordered access of options in tooltip and popover to allow overriding data attrs from js
|
2013-02-02 18:58:56 -05:00 |
|
Guillaume Smet
|
b7764d8a33
|
Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
|
2013-01-29 19:50:13 +01:00 |
|
Guillaume Gautreau
|
ee71fb492f
|
No semicolumns
|
2013-01-27 10:56:01 +01:00 |
|
Guillaume Gautreau
|
d9a0abaa06
|
works with fixed test
|
2013-01-26 21:39:49 +01:00 |
|
Guillaume Gautreau
|
e5be883bb9
|
lint + wrong comparison
|
2013-01-26 14:31:33 +01:00 |
|
Guillaume Gautreau
|
929598784f
|
Unit test for replacing tooltip inside window
|
2013-01-26 14:06:58 +01:00 |
|
Guillaume Gautreau
|
6803ff70f9
|
Tooltip positionning on special cases
|
2013-01-26 13:50:26 +01:00 |
|
Mark Otto
|
7d8d5c7838
|
Merge branch '2.3.0-wip' into 3.0.0-wip
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
|
2013-01-13 04:26:52 -08:00 |
|
Mark Otto
|
9749d6afc2
|
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
|
2012-12-26 09:21:34 -06:00 |
|
fat-kun
|
b9c7f29134
|
Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
|
2012-12-24 16:17:25 -08:00 |
|
Yohn
|
9835549faf
|
made container option be false
|
2012-12-24 18:59:37 -05:00 |
|
Yohn
|
e867ae7b60
|
removed the length check
updated it to @fat's suggestion
|
2012-12-24 18:07:41 -05:00 |
|
Yohn
|
d594d6377a
|
adding container option to tooltips
|
2012-12-23 04:18:16 -05:00 |
|
KAWACHI Takashi
|
defe85bb51
|
Assign event variables at declarations
|
2012-12-23 15:17:41 +09:00 |
|
KAWACHI Takashi
|
7a3a88acc6
|
Tooltips fires show, shown, hide, hidden events
It is re-worked from #3691.
|
2012-12-23 14:42:13 +09:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -08:00 |
|
fat-kun
|
d09b46fe37
|
Merge pull request #6349 from Yohn/patch-6
Fixes #5753 with tooltip('toogle')
|
2012-12-22 14:53:24 -08:00 |
|
fat
|
fad0fb683b
|
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
|
2012-12-22 13:24:37 -08:00 |
|
Yohn
|
e21b6459ad
|
fixes tooltip('toggle')
|
2012-12-20 04:34:28 -05:00 |
|
Mark Otto
|
72f13e2870
|
Merge branch '2.2.3' into 3.0.0-wip
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 00:02:52 -08:00 |
|
fat
|
219d275ae6
|
can't extend bounding box thingy
|
2012-12-19 22:03:57 -08:00 |
|
fat
|
5bd8cdca91
|
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
|
2012-12-19 21:36:50 -08:00 |
|
Mark Otto
|
529ecc5a77
|
Version bump
|
2012-12-10 18:31:04 -08:00 |
|
Mark Otto
|
bc0b94a3fd
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
|
2012-12-08 17:40:42 -08:00 |
|
fat
|
a7eb9c294a
|
add noConflict functionality to all bootstrap plugins
|
2012-12-07 17:06:01 -05:00 |
|
Mark Otto
|
98b0d475ae
|
version bump to 3.0
|
2012-11-30 22:30:50 -08:00 |
|
Mark Otto
|
79b7017227
|
version bump
|
2012-11-05 09:32:48 -08:00 |
|
fat
|
3b3dd3ac3c
|
2.2.1 - hotfix for carousel
|
2012-10-30 21:59:56 -07:00 |
|
Mark Otto
|
41ad16fe40
|
v2.2.0 instead of v2.1.2
|
2012-10-29 21:00:53 -07:00 |
|
billy gates
|
21f29a7682
|
Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
|
2012-10-17 22:15:48 -07:00 |
|
Martin Stein
|
6b017b9bea
|
fixed reference to this.tip() so it works in delegate events
|
2012-10-15 15:17:59 +02:00 |
|
frntz
|
b892a37320
|
Update js/bootstrap-tooltip.js
Avoid loosing events attached on Jquery object if added via function in popover content
|
2012-10-02 18:26:55 +03:00 |
|
Jacob Thornton
|
88b1e44dd6
|
change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
|
2012-09-24 23:28:38 -07:00 |
|
Jacob Thornton
|
003fcccceb
|
change tooltip/popover html default to false for xss safety net
|
2012-09-24 23:15:36 -07:00 |
|
Mark Otto
|
08b8571cb8
|
version bump to get this started
|
2012-09-05 10:00:57 -07:00 |
|
Mark Otto
|
1c134d9a7f
|
update version numbers to 2.1.1
|
2012-08-21 13:11:25 -07:00 |
|
Mark Otto
|
e510306196
|
bump versions to 2.1.0
|
2012-08-19 23:07:18 -07:00 |
|
Jacob Thornton
|
45dddc59a1
|
add click option for tooltip, popover - make click default for popover
|
2012-08-18 19:54:30 -07:00 |
|
Jacob Thornton
|
dcf75697ec
|
some progress on affix plugin
|
2012-07-22 18:28:39 -07:00 |
|
Jon Stevens
|
d76c899142
|
remove the ns option
|
2012-07-22 14:36:23 -07:00 |
|
Jon Stevens
|
393f4a7b42
|
simplify things to one line. pull #4104
|
2012-07-22 14:19:11 -07:00 |
|
Jon Stevens
|
117f65d431
|
on destroy, also hide. issue #3880, pull #4104
|
2012-07-20 09:47:12 -07:00 |
|
Jon Stevens
|
2ee9b2717b
|
namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880
|
2012-07-16 16:01:11 -07:00 |
|