root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12,004 Commits 107 Branches 91 Tags 669 MiB
Commit Graph

92 Commits

Author SHA1 Message Date
XhmikosR b9e59e96af
Replace `master` with `v3-dev` after the branch switch. (#28287) 2019-02-15 23:36:44 +02:00
XhmikosR a43077d3c3 Bump version to 3.4.1. 2019-02-13 17:55:38 +02:00
XhmikosR d4129dff60 Bump year. 2019-02-13 17:55:38 +02:00
XhmikosR e105d15642 Use https, fix broken links and unneeded redirects. 2018-10-18 11:27:47 +03:00
XhmikosR 08529515e5 Bump year to 2018. 2018-10-08 20:12:34 +03:00
don-spyker 2a5ba23ce8 Fix/xss issues on data attributes (#27047) 
* fix(collapse): xss CVE-2018-14040

Fixes #26625

* fix(tooltip): xss CVE-2018-14042

Fixes #26628

* fix(tooltip): XSS on data-viewport attribute

Fixes #27044

* fix(affix): XSS on target config

Fixes #27045
 2018-08-13 18:09:18 +02:00
Johann-S 29f9237f73 Fix XSS in Alert, Carousel, Collapse, Dropdown and Modal 2017-09-14 10:07:51 +02:00
Mark Otto 332a1905f2 bump version 2017-07-04 13:48:46 -07:00
Chris Rebert df08d95495 Update version numbers in preparation for v3.3.7 release (#20357) 
[skip sauce]
 2016-07-25 08:24:11 -07:00
XhmikosR 9b412a7435 Fix JSHint errors. 
[skip sauce]
 2016-03-10 13:44:16 +02:00
Chris Rebert cf3f8e0d58 Update copyright years to 2016 
[ci skip]
 2016-01-01 12:22:03 -08:00
Mark Otto 910400e897 bump version 2015-11-24 11:07:36 -08:00
Mark Otto 83bfff7f07 bump version 2015-06-16 09:10:22 -07:00
Chris Rebert 4d652035dc v3.3.2 => v3.3.4 2015-03-16 08:39:31 -07:00
Chris Rebert 872e56fcf2 .collapse('hide') on hidden uninit-ed collapsible no longer shows it; fixes #15315 
Thanks to @peterblazejewicz & @Nikita240
Adds unit tests based on #14417
X-Ref: #14282
Closes #15807
 2015-03-06 06:58:48 -08:00
Ivan Cheung d5071b19f1 Update all collapse triggers with .collapsed class and aria-expanded 
Fixes #15741
Closes #15751 by merging it.
 2015-02-26 18:48:20 -08:00
Mark Otto c683e7dea7 bump versions 2015-01-19 08:32:13 -08:00
Zlatan Vasović 576230b92a Happy New Year 🎅 2015-01-01 01:23:48 +01:00
Heinrich Fenkart a577f1922e Collapse: Use $.fn.children instead of `>` in selector 
Fixes #15131.
 2014-11-14 15:18:34 +01:00
Mark Otto 9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Mark Otto 94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Heinrich Fenkart ed3a65f084 Handle `collapsed` class on triggers even when manually invoked 
Fixes #13636.
 2014-10-29 04:34:05 +01:00
Heinrich Fenkart e811a24118 Don't fire show event if show is prevented because other element is still transitioning 
Fixes #14844.
Closes #14845.
 2014-10-22 04:25:05 +02:00
Heinrich Fenkart 40f889df2a Merge pull request #14353 from hnrch02/collapse-count-collapsing-as-active 
Collapse: count `.collapsing` elements as actives; closes #13447
 2014-09-13 02:28:25 +02:00
Patrick H. Lauke fb1ca10b99 ARIA support for collapse 
Added handling of aria-expanded=true/false to collapse.js, updated
documentation to include advice on making expand/collapse controls
accessible, updated examples and javascript documentation to use
aria-expanded and aria-controls (when targetting single collapsible
element, using ID rather than class selector)

Closes #14147.
Closes #14153.
 2014-09-09 01:19:20 +02:00
Heinrich Fenkart e4b55ded5c Merge pull request #13928 from SGinTech/sgit_collapseEventOrder 
Ensure that hidden event is sent when content is really hidden (collapsi...
 2014-09-08 23:12:27 +02:00
fat 9c2e54bfec fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called 2014-08-18 19:58:19 -07:00
Heinrich Fenkart 436015c191 Collapse: count `.collapsing` elements as actives; closes #13447 2014-08-08 01:23:50 +02:00
Heinrich Fenkart 231744d628 Expose transition durations on plugin constructors; closes #13656 2014-07-07 13:03:56 +02:00
fat c08e275000 fix build 2014-07-05 23:49:45 -07:00
fat 22f851fa62 apply #14022 without semicolon – cleans up some jquery class usage 2014-07-05 23:28:44 -07:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
sgamel 9445b84b0b Ensure that hidden event is sent when content is really hidden (collapsing class is removed) 2014-06-26 10:18:45 +02:00
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Heinrich Fenkart 587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
fat 2b302f69ee some changes from #13801 - add strict mode back and == 2014-06-12 11:11:04 -07:00
Jacob 696632d7da Merge pull request #13786 from twbs/fat-13430 
add special transitionend type to test event origin
 2014-06-11 22:44:04 -07:00
Heinrich Fenkart e9d6756a1a Fix regression of #10038 introduced by #13772 2014-06-12 06:00:02 +02:00
fat 7f122be004 add special transitionend type to test event origin 
fixes #13430
 2014-06-10 20:42:19 -07:00
Katie Zhu 1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
XhmikosR 7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
fat f219fee07b versions 2014-05-12 21:15:16 -07:00
Mark Otto f20f66604b Merge pull request #11966 from colllin/noconflict 
Fix #11464 - JS noConflict() mode not working in 3.0.x
 2014-04-30 17:43:43 -07:00
Collin Donahue-Oponski a9f2b6ce0f #11464 - Fix JS noConflict mode - Refactor all plugins to use an internal reference to the jQuery plugin, because in noConflict mode you can never expect to be defined on the jQuery object 2014-04-21 23:03:33 -06:00
fat b9ae07d84a fixes #13157 - Collapse plugin - issues with transition end event bubbling 2014-04-21 17:35:29 -07:00
Jacob b02d3c7eff Merge pull request #13306 from twbs/fat-11099 
fixes #11099 - $.collapse() overrides the original dimension of the coll...
 2014-04-20 12:12:17 -07:00
fat cd4696f723 fixes #11099 - $.collapse() overrides the original dimension of the coll... 2014-04-15 21:16:40 -07:00
Germán M. Bravo 82b066f0a9 Wait for the expected target during a collapse 
Actually wait for the collapsed item to complete. If complete is called
with other target, instead of simply returning and do nothing, wait again
until the proper target triggers the event (otherwise this leaves collapse
in a broken state).
 2014-04-12 14:44:35 -05:00
XhmikosR 2b30b48894 Fix the new JSHint warnings. 2014-04-03 10:53:13 +03:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00