Skip to content

Commit fa22ed1

Browse files
authored
Merge branch 'develop' into packet-diagram-bit-counts
2 parents 88ae4ef + 6b886ab commit fa22ed1

File tree

188 files changed

+4082
-1700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+4082
-1700
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': minor
3+
---
4+
5+
feat: Add Vertical Line To Gantt Plot At Specified Time

.changeset/proud-seahorses-wash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
FontAwesome icons can now be embedded as SVGs in flowcharts if they are registered via `mermaid.registerIconPacks`.

.changeset/sixty-deer-tell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': major
3+
---
4+
5+
fix: allow sequence diagram arrows with a trailing colon but no message

.changeset/ten-lamps-trade.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: allow colons in events

.cspell/code-terms.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ frontmatter
5353
funs
5454
gantt
5555
GENERICTYPE
56-
getBoundarys
5756
grammr
5857
graphtype
5958
halign

.cspell/libraries.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dompurify
2626
elkjs
2727
fcose
2828
fontawesome
29+
Fonticons
2930
Forgejo
3031
Foswiki
3132
Gitea

.github/ISSUE_TEMPLATE/theme_proposal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ body:
2929
label: Colors
3030
description: |-
3131
A detailed list of the different colour values to use.
32-
A list of currently used variable names can be found [here](https://mermaid-js.github.io/mermaid/#/theming?id=theme-variables-reference-table)
32+
See the [list of currently used variable names](https://mermaid-js.github.io/mermaid/#/theming?id=theme-variables-reference-table)
3333
placeholder: |-
3434
- background: #f4f4f4
3535
- primaryColor: #fff4dd

.github/lychee.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exclude = [
4646
# Drupal 403
4747
"https://(www.)?drupal.org",
4848

49-
# Swimm returns 404, eventhough the link is valid
49+
# Swimm returns 404, even though the link is valid
5050
"https://docs.swimm.io",
5151

5252
# Timeout

.github/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ markComment: >
1515
If you are still interested in this issue and it is still relevant you can comment to revive it.
1616
# Comment to post when closing a stale issue. Set to `false` to disable
1717
closeComment: >
18-
This issue has been been automatically closed due to a lack of activity.
18+
This issue has been automatically closed due to a lack of activity.
1919
This is done to maintain a clean list of issues that the community is interested in developing.

.github/workflows/e2e-applitools.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,15 @@ jobs:
4545
- if: ${{ env.USE_APPLI }}
4646
name: Notify applitools of new batch
4747
# Copied from docs https://applitools.com/docs/topics/integrations/github-integration-ci-setup.html
48-
run: curl -L -d '' -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH"
4948
env:
5049
# e.g. mermaid-js/mermaid/my-branch
5150
APPLITOOLS_BRANCH: ${{ github.repository }}/${{ github.ref_name }}
5251
APPLITOOLS_PARENT_BRANCH: ${{ github.event.inputs.parent_branch }}
5352
APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }}
5453
APPLITOOLS_SERVER_URL: 'https://eyesapi.applitools.com'
54+
uses: wei/curl@012398a392d02480afa2720780031f8621d5f94c
55+
with:
56+
args: -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH"
5557

5658
- name: Cypress run
5759
uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12

0 commit comments

Comments
 (0)