Commit Graph

1541 Commits

Author SHA1 Message Date
Knut Sveidqvist da79b371fe #3358 Recursive positioning paddings 2023-10-04 10:44:29 +02:00
Knut Sveidqvist c8d155c455 #3358 Recursive positioning 2023-10-03 20:12:33 +02:00
Knut Sveidqvist f00871a6b4 #3358 Recursive positioning 2023-10-03 14:19:08 +02:00
Knut Sveidqvist b4e32542e8 #3358 Recursive positioning 2023-10-03 12:56:47 +02:00
Knut Sveidqvist 836d3a87be WIP 2023-09-14 10:11:43 +02:00
Knut Sveidqvist ccdb803501 Rendering, interim 2023-09-05 15:15:08 +02:00
Knut Sveidqvist 1e864a508d Rendering, tmp commit before refactoring 2023-09-05 11:13:27 +02:00
Knut Sveidqvist 5f1cfc7519 Support for compound blocks with id, title and type 2023-09-01 16:22:23 +02:00
Knut Sveidqvist e52de6c279 Some cleanup 2023-09-01 15:40:49 +02:00
Knut Sveidqvist 8a55b212a2 Saving data from compound blocks 2023-09-01 15:33:38 +02:00
Knut Sveidqvist aa7f5a8387 before refactoring 2023-09-01 14:06:13 +02:00
Knut Sveidqvist 5fc99f1982 #3358 Adding db calls from node statements 2023-08-28 12:51:49 +02:00
Knut Sveidqvist b9531d56c4 Adding support for compound blocks 2023-08-08 15:56:02 +02:00
Knut Sveidqvist 13114ebaa1 Merge branch 'develop' into 3358-blocks-diagram 2023-07-25 11:47:22 +02:00
kgilbert78 3e3e784fd9 added Typora to integrations list 2023-07-24 13:24:33 -04:00
renovate[bot] e4699ef02a
chore(deps): update all patch dependencies 2023-07-24 00:18:49 +00:00
Sibin Thomas 114f918417
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 21:29:56 +05:30
Sibin Thomas 346a7fe8b2 Merge branch 'feature/4451-vertical-branches-in-gitgraph' of https://github.com/mastersibin/mermaid into feature/4451-vertical-branches-in-gitgraph 2023-07-20 21:28:21 +05:30
Sibin Thomas 8ae35c1382 updated documentation for vertical branches 2023-07-20 21:27:34 +05:30
Sidharth Vinod 4795204719
Merge branch 'develop' into sidv/docsVersion
* develop:
  build(docs): handle YAML edgecases in markdown
  run pnpm lint:fix
  Update cypress/helpers/util.ts
  change deprecated `btoa` into `Buffer.from`
  allow ts extension imports in cypress ts files
  build(docs): allow using custom `editLink`
  build(docs): add `editLink: ` to MD frontmatter
  build(docs): run remark plugins on MermaidConfig
  Fix import file extension
  Batch by commit
  resolve lint issues for `no-inferrable-types`
  fix wrong config paramater in some cypress spec
  convert cypress/helpers/util.js into ts
  convert file from js into ts
2023-07-20 20:46:53 +05:30
Sibin Thomas 99e88e4d0d
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 16:03:19 +05:30
Sidharth Vinod 1b2340ba75
Merge pull request #4640 from aloisklink/docs/fix-edit-url
Fix the "Edit this page on GitHub" link in Vitepress documentation for the Mermaid Config pages
2023-07-20 06:59:46 +00:00
Alois Klink 4d2d790cc8 build(docs): handle YAML edgecases in markdown
Our current method of adding a entry using `+=` is not safe in YAML,
since it's valid to make a YAML object entirely in JSON,
see https://github.com/mermaid-js/mermaid/pull/4640#discussion_r1265133463

We're already using `js-yaml` elsewhere in this file, so we may as well
use it for parsing/stringifying.

Reported-by: Remco Haszing <remcohaszing@gmail.com>
2023-07-19 23:40:46 +01:00
Sibin Thomas cba5b5a7e3 ran preetier 2023-07-19 21:55:24 +05:30
Sibin Thomas d81e4fabd5 positioned tags, tilted commit labels and fixed some bugs 2023-07-19 20:22:29 +05:30
Sibin Thomas 863d1bfd4d removed BT and added TB 2023-07-19 20:21:15 +05:30
Sibin Thomas 9c2afac319
Merge branch 'mermaid-js:develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-19 20:13:53 +05:30
Sidharth Vinod 568d686d2f
Merge branch 'develop' into sidv/docsVersion 2023-07-18 22:07:42 +05:30
Sidharth Vinod 3fcb071592
Move docs.cli to scripts 2023-07-18 22:06:43 +05:30
Sidharth Vinod fff3acd064
Verify release-version on push to release or master 2023-07-18 21:55:44 +05:30
Sidharth Vinod e66135b67e
Merge pull request #4496 from moka-care/bug/4439_graph_doesnt_load_when_img_fail_to_load
Fix graph not loading when the img loads too fast or fail to load
2023-07-18 07:57:38 +00:00
Yokozuna59 072638ce9d
Merge pull request #4634 from leinelissen/develop
feat: allow specifying on which weekday a tickInterval should start
2023-07-18 07:33:08 +00:00
Sidharth Vinod 24f04bb24d
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram 2023-07-17 15:11:39 +05:30
Sidharth Vinod 48a49b1b4d
Merge pull request #4588 from ibrahimWassouf/enhancement/4158_Add_primary_key_beginning_with_asterisk
Allow entity diagram attribute names to start with asterisk
2023-07-17 09:26:46 +00:00
Sidharth Vinod 5e6d42cb5b
Merge pull request #4641 from aloisklink/chore/remove-unused-coveralls-devDependency
chore: remove unused `devDependency` on coveralls
2023-07-17 09:20:02 +00:00
Guilherme Gonzaga 855f6ef9bf docs: Fix checkbox syntax 2023-07-16 23:16:37 +00:00
Alois Klink a0a25ed756 chore: remove unused `devDependency` on coveralls
This `devDependency` hasn't been used for a long time.
2023-07-16 00:21:43 +01:00
Alois Klink af9b3f77cb build(docs): allow using custom `editLink`
In Vitepress, allow using a custom `editLink`, if specified in the YAML
frontmatter.
2023-07-15 23:43:24 +01:00
Alois Klink 57ee181fad build(docs): add `editLink: ` to MD frontmatter
Add a YAML front-matter entry called `editLink` to Markdown files in
Vitepress, e.g.

```markdown
---
editLink: "https://github.com/mermaid-js/mermaid/edit/develop/packages/mermaid/src/schemas/config.schema.yaml"
---

Here is my markdown file!
```

Although Vitepress doesn't officially support adding a URL as a
`editLink:` YAML front-matter, we can add a custom `editLink` function
to our Vitepress config that does allow it.
2023-07-15 23:43:24 +01:00
Yokozuna59 39ccad8e5e
Merge branch 'develop' into develop 2023-07-15 15:44:19 +02:00
Lei Nelissen 7e39c13836
chore: narrow down tstype 2023-07-15 15:38:21 +02:00
Lei Nelissen 85515bcf8d
chore: leave the newLine out of the jison spec 2023-07-15 15:28:48 +02:00
Sibin Thomas 383bbefa9e Added code for Vertical branches for GitGraph and Added TB option in the parser file. 2023-07-15 18:27:42 +05:30
Ibrahim Wassouf 9b9671b57c
Merge branch 'develop' into enhancement/4158_Add_primary_key_beginning_with_asterisk 2023-07-15 08:50:01 -04:00
Ibrahim Wassouf d6c88ab589
Merge branch 'develop' into bug/4592_fix_newLine_padding_class_diagram 2023-07-15 08:49:38 -04:00
Sidharth Vinod 840609af63
Merge pull request #4577 from kislerdm/bug/4576-c4-support-for-ContainerQueue_Ext
Fixes support of the macro `ContainerQueue_Ext` for C4 diagrams definition.
2023-07-15 07:35:05 +00:00
Lei Nelissen eff9f7e5db
chore: re-generate config 2023-07-15 00:24:02 +02:00
Lei Nelissen 803cd826ed
chore: replace switch-case with map 2023-07-15 00:17:10 +02:00
Lei Nelissen 90c68f5069
chore: add tsType for weekday config 2023-07-15 00:17:09 +02:00
Lei Nelissen 103321bf72
chore: return after scanning weekday in jison 2023-07-15 00:17:09 +02:00