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-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 |
|
Mark Otto
|
1629df8008
|
screwed up a merge and an old version number crept in
|
2013-02-05 21:20:29 -08:00 |
|
Joseph Price
|
4b86a91e53
|
fix typo
|
2013-02-04 09:10:48 -05: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 |
|
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
|
6e5a2fedaa
|
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
|
2013-01-10 18:51:04 -08:00 |
|
Mark Otto
|
f74990d898
|
Version bump
|
2012-12-22 16:10:06 -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
|
33e14fe5bf
|
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
|
2012-12-05 11:05:10 -08:00 |
|
Mark Otto
|
85c57c6ba8
|
Merge branch 'Moveo-master' into 2.2.2-wip
|
2012-12-02 01:32:13 -08:00 |
|
Mark Otto
|
98b0d475ae
|
version bump to 3.0
|
2012-11-30 22:30:50 -08:00 |
|
Swaagie
|
e6e4d93d5e
|
leave it to the developer to decide how to use the content of the popover
|
2012-11-27 15:07:31 +01: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 |
|
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 |
|
Jon Stevens
|
3a5b4cc7df
|
simplify code into a single line
|
2012-06-20 10:42:25 -07:00 |
|
Jon Stevens
|
6a974f9ff7
|
enable the ability to destroy tooltips and popovers from elements. related to issue #3453
|
2012-06-18 19:25:54 -07:00 |
|
Jacob Thornton
|
f836473129
|
add html option back to tooltip and popover to explicitly prevent XSS #3421
|
2012-06-02 17:55:10 -07:00 |
|
Jacob Thornton
|
ebc6935663
|
2.0.3 -> 2.0.4
|
2012-06-01 11:04:27 -07:00 |
|
Jacob Thornton
|
839ef3a030
|
2.0.2 -> 2.0.3
|
2012-04-24 02:19:02 -07:00 |
|
Jacob Thornton
|
575f18aaf4
|
add jshint support + a few minor stylistic changes
|
2012-04-14 16:29:53 -07:00 |
|
Jacob Thornton
|
83febb3452
|
remake and add isHTML check to popover as well
|
2012-04-04 15:02:30 -07:00 |
|
Jacob Thornton
|
f02d017ffa
|
return matcher value directly + cleanup first lines of files
|
2012-03-24 18:59:04 -07:00 |
|
Jacob Thornton
|
d5fb653914
|
top stripping leading and trailing whitespace + always use .html method
|
2012-03-21 21:35:02 -07:00 |
|
Jacob Thornton
|
59503e71ff
|
2.0.2 derp
|
2012-03-12 14:09:38 -07:00 |
|
Jacob Thornton
|
7ec09d0db9
|
2.0.1
|
2012-02-16 22:42:38 -08:00 |
|
Jacob Thornton
|
6e77c9d123
|
add semicolons to the end of js files
|
2012-02-13 18:41:02 -08:00 |
|
Mark Otto
|
f4e5bc1c53
|
namespace popover values
|
2012-01-30 01:20:51 -08:00 |
|
Jon Stevens
|
84a8aa1bea
|
2.0-wip: fix js heads
|
2012-01-24 11:08:03 -08:00 |
|
Nicklas Ansman Giertz
|
6a9f169fd6
|
Make the popove respect custom classes
|
2012-01-22 12:06:59 +01:00 |
|
Mark Otto
|
16eccc43d9
|
dates updated to 2012
|
2012-01-14 23:28:48 -08:00 |
|
Jacob Thornton
|
6f2f947a43
|
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
|
2012-01-11 21:42:55 -08:00 |
|
Jacob Thornton
|
f72a94ae28
|
update more readme changes - introduce target specificty convention to more plugins
|
2011-12-20 23:28:48 -08:00 |
|
Jacob Thornton
|
0980a33b47
|
update all to new on api + add animation support to tabs
|
2011-12-20 19:37:41 -08:00 |
|
Jacob Thornton
|
1ef5fa7d6b
|
giant refactor - all spec passing again...
|
2011-12-20 18:02:47 -08:00 |
|
Jacob Thornton
|
cee2f61898
|
define constructor on prototypes
|
2011-11-30 22:42:22 -08:00 |
|
Jacob Thornton
|
3925ea9986
|
remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly
|
2011-11-27 16:01:26 -08:00 |
|
Jacob Thornton
|
36a7eb3851
|
add build script for minified files and allow elements to be returned to getContent and title in popovers
|
2011-11-20 21:36:26 -08:00 |
|