GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity
7,071 Commits 182 Branches 159 Tags
Commit Graph

799 Commits

Author SHA1 Message Date
Per Brolin
51a84eeb90 Merge branch 'develop' of github.com:mermaid-js/mermaid into develop 2022-11-14 16:34:57 +01:00
Sidharth Vinod
a83f88bdf1
chore: Merge master to develop 2022-11-10 13:51:53 +05:30
Sidharth Vinod
c7f7ff39ce
fix: Import path in viewer.js 2022-11-09 00:43:19 +05:30
Sidharth Vinod
1b2dce99c9
Merge branch 'release/9.2.1' of https://github.com/mermaid-js/mermaid into sidv/fixLL 
* 'release/9.2.1' of https://github.com/mermaid-js/mermaid:
  Fixing applitools batches
 2022-11-08 20:15:13 +05:30
Knut Sveidqvist
ba7f83019f Fixing applitools batches 2022-11-08 15:25:05 +01:00
Sidharth Vinod
6d2552ea6e
fix: Filenames 2022-11-08 19:26:02 +05:30
Sidharth Vinod
20b4358c0e
fix: Make options in registerExternalDiagrams optional 2022-11-08 19:21:49 +05:30
Sidharth Vinod
aab8f9273f
Merge branch 'feat/3701-expose-registerDiagram' into sidv/fixLL 
* feat/3701-expose-registerDiagram:
  feat: add `mermaidAPI.registerDiagram()`
  refactor(mermaid): remove registerDiagram cb func
  fix(mermaid): fix DiagramDefinition types
 2022-11-08 13:50:54 +05:30
Knut Sveidqvist
357a928cce Fixing applitools batches 2022-11-04 13:05:46 +01:00
Per Brolin
1d9fefe7ac Added pie 2022-11-04 12:44:13 +01:00
Knut Sveidqvist
4c779beda9
Merge pull request #3729 from DarkNami/feature/1598_add_tick_interval 
feat(gantt): Add option 'tickInterval' for custom tick interval
 2022-11-01 13:50:38 +01:00
DarkNami
3166f689f9 feat(gantt): Add option 'tickInterval' for custom tick interval 
See issue #1598
 2022-10-27 16:47:42 +08:00
Ashley Engelund (weedySeaDragon @ github)
599d035daf merge MERMAID/develop into branch 2022-10-25 07:42:57 -07:00
Knut Sveidqvist
3dca7d10d5
Merge pull request #3668 from mermaid-js/3659_height_handling 
#3659 Adding height when not using maxWidth
 2022-10-25 14:48:50 +02:00
Knut Sveidqvist
f4bb978a87
Merge pull request #3649 from DKurilo/feat/3247-statements-aliases 
add statement aliases for ER diagram
 2022-10-25 14:46:29 +02:00
Knut Sveidqvist
27a68819bc
Merge pull request #3647 from DKurilo/feat/1414-notes-to-class-diagram 
add the way to add notes to class diagram
 2022-10-25 14:45:03 +02:00
Alois Klink
f41e34e61a feat: add mermaidAPI.registerDiagram() 
Exposes the registerDiagram() function publically as
`mermaid.mermaidAPI.registerDiagram` so that users can add their
own diagrams at bundle-time.

This is instead of using the lazyLoadedDiagrams config setting.
 2022-10-23 16:53:25 +01:00
Jeroen Ekkelkamp
0c4edd332c Ran linter (npm run lint:fix) 2022-10-19 20:06:54 +02:00
Knut Sveidqvist
904c011baf Merge remote-tracking branch 'origin/develop' into develop 2022-10-19 14:33:55 +02:00
Knut Sveidqvist
352dd5dcf7 testcode 2022-10-19 14:32:28 +02:00
Santosh Viswanatham
c71b6e31f7
Merge branch 'develop' into feat/3601-cspell-configuration 2022-10-18 21:02:38 +05:30
Dima Kurilo
20751a6496 fix cypress tests for erDiagram, add eslint-plugin-no-only-tests plugin because of this comment: https://github.com/mermaid-js/mermaid/pull/3647#issuecomment-1281163858 2022-10-17 13:20:17 -04:00
Dima Kurilo
75e11b1fde add basic render (cypress) test for classDiagram-v2 too 2022-10-17 12:33:23 -04:00
Dima Kurilo
cead1f36f4 add basic render (cypress test for notes 2022-10-17 12:13:22 -04:00
Dima Kurilo
3108e896b6 add renedering (cypress) tests 2022-10-17 12:03:51 -04:00
Alois Klink
989d716c36
style: fix @cspell/eslint warnings 
Ignores some names of contributors, and adjusts some capitilization
spacing to fix all cspell warnings.
 2022-10-16 10:23:23 +01:00
Santosh Viswanatham
1f642ca9b6
Merge branch 'develop' into feat/3601-cspell-configuration 2022-10-15 19:48:08 +05:30
devcer
478c387491 added words to cspell ignore words list, removed mywords.txt 2022-10-15 19:43:07 +05:30
Knut Sveidqvist
4be66554b3 #3659 Adding height when not using maxWidth 2022-10-13 14:26:05 +02:00
Ashley Engelund (weedySeaDragon @ github)
d1f3b889d6 add cypress tests for classDefs and applying classes to states 2022-10-11 08:33:43 -07:00
Knut Sveidqvist
bc5ef5fb7d Fix for async issue in parse, adding parseAsync 2022-10-11 11:20:34 +02:00
Sidharth Vinod
23e590e09b
Revert "fix(test): Rerender" 
This reverts commit a017ffc3c947084d2977a12aa75c831574ed19b9.
 2022-10-10 22:04:33 +08:00
Sidharth Vinod
60e4585e20
Revert "fix: use async in render-after-error" 
This reverts commit d59f8780208e82e0f7b55f751ef6d148a4cdfe44.
 2022-10-10 22:04:05 +08:00
Sidharth Vinod
ba436cc37a
fix: Tests 2022-10-10 21:57:22 +08:00
Knut Sveidqvist
e876c35ef9
Merge pull request #3591 from mermaid-js/sidv/fixDetectDiagram 
fix Detect diagram fallback
 2022-10-10 13:43:41 +02:00
Sidharth Vinod
6e2deb1fa7
fix: Fix eslint warnings 2022-10-09 22:08:32 +08:00
Sidharth Vinod
069437842b
Merge branch 'develop' into sidv/fixDetectDiagram 
* develop: (50 commits)
  docs: Sync
  capitalization fix
  format Setup.md
  format cSpell.json
  format docs YAML
  format cSpell.json
  separate words & ignoreWords
  fix: "skin param"
  ignore the changelog
  Revert "fix: "skin param""
  fix: "skin param"
  fix: "corresponding"
  known terms
  known terms
  fix: "JetBrains"
  known terms
  known terms
  fix: "stable"
  known term
  add known term
  ...
 2022-10-08 12:35:40 +08:00
Knut Sveidqvist
646f76d343 Fix for broken test 2022-10-07 14:36:25 +02:00
Knut Sveidqvist
047e15951a Fix for issue in classdiagram-v2 from the typescript updates 2022-10-07 12:17:35 +02:00
Knut Sveidqvist
802407c8ae Merge remote-tracking branch 'origin/develop' into lazy-load-import 2022-10-07 10:46:16 +02:00
Knut Sveidqvist
439274c5ae chore: Cleanup 2022-10-07 10:40:01 +02:00
Sidharth Vinod
cc55a82b64
Merge branch 'develop' into sidv/fixDetectDiagram 
* develop:
  chore: cleanup
  fix: dynamic import
  fix: Filename in viewer.js
  fix: pnpm not found
  fix: Import diagram
  Updated logic for diagram loading
  WIP
 2022-10-07 16:30:34 +08:00
Sidharth Vinod
acd9a8aefb
Merge branch 'lazy-load-import' into sidv/fixE2E 
* lazy-load-import:
  chore: cleanup
  fix: dynamic import
  fix: Filename in viewer.js
  fix: Import diagram
  Updated logic for diagram loading
  WIP
 2022-10-07 15:02:47 +08:00
Sidharth Vinod
3e3de72093
fix: dynamic import 2022-10-07 14:51:37 +08:00
Sidharth Vinod
9f286b46ff
fix: Filename in viewer.js 2022-10-06 23:39:30 +08:00
Sidharth Vinod
1615c6d9f9
fix #3391: Remove flowchart as fallback for diagram detection. 2022-10-06 19:14:25 +08:00
Sidharth Vinod
d59f878020
fix: use async in render-after-error 2022-10-06 17:49:10 +08:00
Sidharth Vinod
c919bef70e
fix: Import diagram 2022-10-06 13:47:00 +08:00
Knut Sveidqvist
0f2e0c2ab4 Updated logic for diagram loading 2022-10-05 22:03:05 +02:00
Knut Sveidqvist
c05c98c082 WIP 2022-10-05 13:14:05 +02:00