Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for highlighting CSP, HSTS, and HPKP #1275

Merged
merged 23 commits into from
Jan 31, 2018
Merged

Add support for highlighting CSP, HSTS, and HPKP #1275

merged 23 commits into from
Jan 31, 2018

Conversation

papandreou
Copy link
Contributor

Adds the missing pieces to #1016. I couldn't push to the existing branch, so I'm opening a fresh PR instead.

ScottHelme and others added 13 commits August 24, 2016 20:29
@ScottHelme
Add CSP support.
b4e42d1
@ScottHelme
Add HPKP support.
23ada00
@ScottHelme
Add HSTS support.
6ec87ae
@ScottHelme
Updates based on feedback.
02cc166
@ScottHelme
Updates based on feedback.
e6c9754
@ScottHelme
Updates based on feedback.
2d89408
@ScottHelme
Updates based on feedback.
5a1b847
@ScottHelme
Updates based on feedback.
7ca1900
@ScottHelme
Updates based on feedback.
52b5b93
@ScottHelme
Updates based on Feedback.
053f50a
@ScottHelme
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
61e1a68 
# Conflicts:
#	components/prism-csp.js
#	components/prism-csp.min.js
#	components/prism-hpkp.js
#	components/prism-hpkp.min.js
#	components/prism-hsts.min.js
@ScottHelme
Fix parentheses.
d09523d
@papandreou
Merge branch 'gh-pages' into HEAD
f380988 
* gh-pages: (326 commits)
  Add C++ platform-independent types (PrismJS#1271)
  Release 1.10.0
  Unescaped markup plugin: Make it work with any language (PrismJS#1265)
  Previewers: New plugin combining previous plugins Previewer: Base, Previewer: Angle, Previewer: Color, Previewer: Easing, Previewer: Gradient and Previewer: Time. Fix PrismJS#913 (PrismJS#1244)
  Add Elm (elm-lang.org) support (PrismJS#1174)
  IchigoJam: Remove unneeded escape
  Run gulp
  add Io syntax (PrismJS#1251)
  package.json: add attribute `style` (PrismJS#1256)
  Add the C++11 raw string feature to the cpp language
  IchigoJam: Make strings greedy
  BASIC: Make strings greedy
  Run gulp
  Add support for IchigoJam BASIC (PrismJS#1246)
  Add support for 6502 assembly (PrismJS#1245)
  fix for autoloader plugin
  Run gulp and reorder components alphabetically
  Xeora Language implementation (PrismJS#1239)
  upgrade autoloader
  Release 1.9.0
  ...
@papandreou papandreou mentioned this pull request Jan 29, 2018
Closed
Golmote
Golmote reviewed Jan 30, 2018
View reviewed changes
tests/run-child.js Outdated
process.send({error: JSON.stringify({
message: e.message,
stack: e.stack
})});
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't include this change here and rather make another PR for it.

@Golmote
Copy link
Contributor

Golmote commented Jan 30, 2018

Hi @papandreou! Thanks for working on this.
From a quick look, this seems quite complete to me. I'll have to give it a try before merging though.

I think running gulp should make changes to the Show Language plugin. Could you include them in the PR?

@ScottHelme Let me know if you're ok with this being merged instead of #1016. Note that @papandreou referenced you as the "owner" of the languages. This means we expect you to do some kind of maintenance if future issues occur on these components. Please discuss it if @papandreou should have this responsability instead.

@papandreou
Copy link
Contributor Author

@Golmote, thanks for taking a look! I moved the error propagation thing to a separate PR (#1276) and force pushed my branch here.

Also pushed commits that build the minified components and the "Show Language" plugin.

@ScottHelme
Copy link

All good on my side!

@papandreou
Copy link
Contributor Author

I can help out as well, but @ScottHelme is certainly riding the bleeding edge more than I am :)

@Golmote Golmote merged commit b08cae5 into PrismJS:gh-pages Jan 31, 2018
@Golmote
Copy link
Contributor

Golmote commented Jan 31, 2018

Thank you both for contributing!

@mAAdhaTTah mAAdhaTTah mentioned this pull request Feb 5, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Golmote Golmote Golmote left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@papandreou @Golmote @ScottHelme