Skip to content

Fix some XSS in v3#23687

Merged
Johann-S merged 1 commit into
v3.4.0-devfrom
v3-xss-data-target
Sep 14, 2017
Merged

Fix some XSS in v3#23687
Johann-S merged 1 commit into
v3.4.0-devfrom
v3-xss-data-target

Conversation

@Johann-S

@Johann-S Johann-S commented Aug 26, 2017

Copy link
Copy Markdown
Member

Comment thread js/carousel.js Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@Johann-S

Copy link
Copy Markdown
Member Author

Error in our gh_pages 🤔
https://travis-ci.org/twbs/bootstrap/jobs/268638535#L546

@XhmikosR

Copy link
Copy Markdown
Member

Yeah, I don't think this branch is right. We have changes in v3-dev branch and that is what you should target.

@Johann-S

Johann-S commented Aug 26, 2017

Copy link
Copy Markdown
Member Author

@mdo made a lot of work in this branch see : https://github.com/twbs/bootstrap/commits/v3.4.0-dev
maybe instead you should put your work on this branch

@Johann-S Johann-S force-pushed the v3-xss-data-target branch from 3c3e598 to 603f925 Compare August 26, 2017 09:54
Comment thread js/carousel.js Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@Johann-S Johann-S force-pushed the v3-xss-data-target branch from 603f925 to d9be1da Compare August 26, 2017 10:00
@XhmikosR

Copy link
Copy Markdown
Member

But all I'm saying it's just when Mark is done, he should merge his changes in v3-dev. v3.4.0 seems a lot more specific, more of a WIP branch that will be merged to the base v3-dev one when done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants