Skip to content

Commit 0aaab5a

Browse files
committed
Merge branch 'master' into dev
# Conflicts: # package-lock.json # package.json
2 parents e783c88 + d1d0cd9 commit 0aaab5a

17 files changed

Lines changed: 2152 additions & 3867 deletions

File tree

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
## introduction
1111

1212
htmx allows you to access [AJAX](https://htmx.org/docs#ajax), [CSS Transitions](https://htmx.org/docs#css_transitions),
13-
[WebSockets](https://htmx.org/docs#websockets) and [Server Sent Events](https://htmx.org/docs#sse)
13+
[WebSockets](https://htmx.org/extensions/ws/) and [Server Sent Events](https://htmx.org/extensions/sse/)
1414
directly in HTML, using [attributes](https://htmx.org/reference#attributes), so you can build
1515
[modern user interfaces](https://htmx.org/examples) with the [simplicity](https://en.wikipedia.org/wiki/HATEOAS) and
1616
[power](https://www.ics.uci.edu/~fielding/pubs/dissertation/rest_arch_style.htm) of hypertext
@@ -99,8 +99,6 @@ At this point you can modify `/src/htmx.js` to add features, and then add tests
9999
htmx uses the [mocha](https://mochajs.org/) testing framework, the [chai](https://www.chaijs.com/) assertion framework
100100
and [sinon](https://sinonjs.org/releases/v9/fake-xhr-and-server/) to mock out AJAX requests. They are all OK.
101101

102-
You can also run live tests and demo of the WebSockets and Server-Side Events extensions with `npm run ws-tests`
103-
104102
## haiku
105103

106104
*javascript fatigue:<br/>

SECURITY.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 2.x | :white_check_mark: |
8+
| 1.9.x | :white_check_mark: |
9+
| < 1.9 | :x: |
10+
11+
## Reporting a Vulnerability
12+
13+
If you think you've found a vulnerability, please use the _Report a vulnerability_ button found in the [security tab](https://github.com/bigskysoftware/htmx/security) of the project on Github.
14+
15+
This process is documented in GitHub's _Secure Coding_ guide: [Privately reporting a security vulnerability](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability).

editors/jetbrains/htmx.svg

Lines changed: 46 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)