Justin Greywolf
6abf0f1d19
Merge branch 'develop' into UpdateClassMemberHandling
2023-06-29 08:55:37 -07:00
Nikolay Rozhkov
e7ad294283
Merge branch 'develop' into feature/4492_sankey-diagrams
2023-06-29 16:50:38 +03:00
Justin Greywolf
3718274a1c
Merge branch 'develop' into UpdateClassMemberHandling
2023-06-28 08:26:33 -07:00
Nikolay Rozhkov
a38733346f
Removed unnecessary configs and extra code
2023-06-25 21:56:14 +03:00
Tom PERRILLAT-COLLOMB
61e5dbeaa6
fix(class): keep members in namespace classes
2023-06-25 00:15:35 +02:00
Nikolay Rozhkov
b23e86aea3
Added options for coloring
2023-06-25 00:22:36 +03:00
Nikolay Rozhkov
1674f12b62
Renamed sankey to sankey-beta
2023-06-24 23:11:54 +03:00
Nikolay Rozhkov
104aece46e
Cleanup sankey diagrams according code review
2023-06-22 17:35:46 +03:00
Nikolay Rozhkov
9a29066426
Ensure that sankey keyword does not intefere with csv
2023-06-22 16:53:44 +03:00
Nikolay Rozhkov
272615e580
Fixed tests and added node alignment
2023-06-21 03:54:55 +03:00
Nikolay Rozhkov
362648b74b
Trim trailing spaces
2023-06-21 01:37:06 +03:00
Nikolay Rozhkov
a2c055ba5d
CSV syntax implementation
2023-06-21 01:29:34 +03:00
Yokozuna59
906d909d87
Merge branch develop into standardized-pie-definitions
2023-06-19 13:39:41 +03:00
Nikolay Rozhkov
fd3ffdc22a
Prettify
2023-06-19 04:34:41 +03:00
Nikolay Rozhkov
6722ac7540
Multiple improvements on syntax
...
Syntax has been simplified
Removed extra initial states
Removed unused groups
Nodes can be wrapped in double qotes
Updated demo page
2023-06-19 04:02:40 +03:00
Nikolay Rozhkov
9dbb9872bc
Fix linters
2023-06-19 01:05:33 +03:00
Nikolay Rozhkov
19f858b73b
Fixed nodes duplicates
2023-06-19 01:05:33 +03:00
Nikolay Rozhkov
afaf87e414
At last something is working
2023-06-19 01:05:20 +03:00
Nikolay Rozhkov
40f7105ae4
Started renderer development
2023-06-19 01:05:20 +03:00
Nikolay Rozhkov
c874d74faf
Some fixes to docker and demos
2023-06-19 01:02:50 +03:00
Sidharth Vinod
bfa76af434
Merge branch 'develop' into pr/tomperr/3923
...
* develop: (783 commits)
chore(deps): update all minor dependencies
chore: Run codecov based on E2E test status
change REAMDME.md coverage from coveralls into codecov
Add codecov.yaml
Upload E2E
set normal mode for vitest coverage
Fix path name
Add codecov to unit tests
Add codecov to E2E
chore: Add coverage scripts
chore: add excludes
chore: update deps
Merge coverages
Add coverage paths
Rebuild
chore: update pnpm
Add coverage for E2E tests
rename plugin variable into info in infoDetector.ts
remove cypress/platform/index.html
update pnpm-lock.yaml
...
2023-06-18 12:45:58 +05:30
Yokozuna59
afea3e8f37
clean up demos/pie.html
2023-06-16 23:03:42 +03:00
Yokozuna59
896a8a23ca
indent info.html files
2023-06-15 23:51:03 +03:00
Yokozuna59
35e81f3fd4
format and add theme to cypress info.html
2023-06-15 02:56:29 +03:00
Yokozuna59
9deae27c82
add messing timeline and info demoes links
2023-06-15 02:30:51 +03:00
Justin Greywolf
164605b442
update classes to handle , in generic
2023-06-12 11:31:29 -07:00
Sidharth Vinod
97be4983f0
Merge branch 'develop' into sidv/zenuml
...
* develop: (66 commits)
Update docs
Update docs
Improve the wording of security level values
Added quadrantChart to the side bar
Added e2e test cases with some fixes
Added documentation for the quadrantChart
Restructured the build function and addressed more review comment
Fixed some parser issue and added test cases for the parser
Fixed review comment
Update docs
Converted files to typescript and added proper types
Fix blog linting
Debug fetch-contributors
Fix lockfile
Revert "Replace esno & ts-node with tsx"
[draft] Added support for quadrant chart
Fix lockfile
Fix build
Update pnpm-lock
Replace esno & ts-node with tsx
...
2023-05-16 23:26:35 +05:30
Subhash Halder
1253733962
Fixed review comment
2023-05-11 12:19:59 +05:30
Subhash Halder
9a7dbab5ed
Converted files to typescript and added proper types
2023-05-09 20:17:04 +05:30
Subhash Halder
272ccded93
[draft] Added support for quadrant chart
2023-05-08 19:23:58 +05:30
Justin Greywolf
06fdb95389
Allow overlapping notes
2023-05-03 22:15:59 -07:00
Sidharth Vinod
12ed81855a
Add zenuml
2023-04-23 00:34:59 +05:30
raghvendra
ff3104ad9c
pie diagram mermaid module import fix
2023-04-19 11:25:32 +05:30
Knut Sveidqvist
057c9e4b81
Merge branch 'develop' into feature/1618_repeating_tasks
2023-03-31 08:42:10 +02:00
Sidharth Vinod
46ab6f46f2
fix( #4256 ): Keep error diagram on screen
2023-03-30 23:09:46 +05:30
Jeremy Funk
ba1c5dc6c7
Change to using display mode yaml
2023-03-25 01:56:50 +01:00
Jeremy Funk
8c0550b2b7
Code refactoring, add e2e test
2023-03-23 23:45:59 +01:00
Jeremy Funk
45c0c5fee0
Bugfix
2023-03-23 22:54:58 +01:00
Jeremy Funk
a535fe1679
Bugfixes, refactor, add compact
2023-03-23 22:38:04 +01:00
Sidharth Vinod
4e4f2fcfc5
Merge branch 'master' into develop
...
* master:
Updated import of cytoscape for consistent behavior
v9.4.3
fix: dayjs import extension
9.4.2
Fix mindmap demo
9.4.2-rc.2
chore: Rename diagram-definitions with specific names
Use cytoscape esm
Revert "chore: Defer elk loading"
Revert "Split cytoscape"
test(gantt): test daylight savings in ganttdb
refactor(deps): replace `moment` with `dayjs`
fix(E2E): Add cors package
fix Server
Fix lockfile
Remove Readme
2023-03-08 00:13:54 +05:30
Sidharth Vinod
328f3968d1
Merge branch 'release/9.4.2'
...
* release/9.4.2:
9.4.2
Fix mindmap demo
9.4.2-rc.2
chore: Rename diagram-definitions with specific names
Use cytoscape esm
Revert "chore: Defer elk loading"
Revert "Split cytoscape"
test(gantt): test daylight savings in ganttdb
refactor(deps): replace `moment` with `dayjs`
fix(E2E): Add cors package
fix Server
Fix lockfile
Remove Readme
2023-03-07 21:33:23 +05:30
Sidharth Vinod
86aa7ab91e
Fix mindmap demo
2023-03-07 18:09:33 +05:30
Sidharth Vinod
ad52d7d823
Merge pull request #4145 from Billiam/feature/move-pie-labels
...
Pie: Adding outer border, text position options
2023-03-05 00:33:15 +05:30
Billiam
82f5b4ca39
Move pie outerStrokeWidth to theme variables, update docs
2023-02-28 13:27:09 -06:00
Billiam
b079fb4710
fixup! feat(pie): adding outer border, text position options
2023-02-25 15:43:16 -06:00
Sidharth Vinod
b13707fa7b
fix: Class label not visible if class is already defined
2023-02-24 13:46:56 +05:30
Per Brolin
8743e9e30e
Removed the deprecated use of mindmap in Demo
2023-02-20 14:50:04 +01:00
Sidharth Vinod
638362baea
Merge branch 'release/10.0.0' into sidv/splitDiagrams
...
* release/10.0.0: (333 commits)
10.0.0-rc.3
Export more types
no side effects
10.0.0-rc.2
skip failing elk test
Cleanup
Update docs
fix(#3406 , #3394 ): Remove init & initThrowsErrors
chore: Rename lazy loaded diagram definitions
Skip flowchart-elk failing test
Fix docs
fix Server
Fix lint
Remove Readme
Fix E2E Tests
Fix tests
feat: Break render and parse types
chore: Remove all non async render/parse/init
Remove CJS builds from docs
chore: Remove cjs from build
...
2023-02-19 20:18:26 +05:30
Sidharth Vinod
735aceb37a
Fix E2E Tests
2023-02-19 14:03:11 +05:30
Sidharth Vinod
d562a81019
Merge branch 'develop' into timeline
...
* develop: (45 commits)
Showcase section to the docs - keepings docs up to date (#4055 )
bugfix: add missing d3 curves to flowchart and docs
fix(deps): update dependency dagre-d3-es to v7.0.8
build(pre-commit): cache eslint in pre-commit
build(lint): cache eslint with strategy content
Update cypress/integration/rendering/sequencediagram.spec.js
feat(er): allow leading underscore for attributes name
ci(lint): show nice error on lint failure
chore: add moment to dependencies
Update docs
Update mindmap.md
chore: remove moment-mini
docs(readme-ch): fix twitter link
build(lint): cache prettier on `pnpm run lint`
fix: moment-mini default exporter
docs(readme): update broken twitter badge
test(er): improve tests on multiple key constraints
Fixes Typo, remove console.log
doc(er): add documentation on multiple key constraints
feat(er): allow multiple constraints on attributes
...
2023-02-08 15:57:09 +05:30
Olivier Leveau
9fb6f1998f
Merge branch 'develop' into feature/AddBoxForSeqDiagrams
2023-01-26 09:14:18 +01:00
Sidharth Vinod
c51f6df82c
Merge pull request #4030 from tomperr/feature/4009_er_multiple_constraints
...
feat(er): add multiple key constraints
2023-01-26 00:16:58 +05:30
Tom PERRILLAT-COLLOMB
dc0a46f742
test(er): improve tests on multiple key constraints
2023-01-25 19:40:40 +01:00
Sidharth Vinod
c76728b423
Merge pull request #3902 from weedySeaDragon/bug/3858_state_named_state_container
...
Bug/3858 [state] trailing whitespace in ids for named state container
2023-01-25 22:51:34 +05:30
Tom PERRILLAT-COLLOMB
3066a4b43a
doc(er): add documentation on multiple key constraints
2023-01-25 15:13:58 +01:00
Tom PERRILLAT-COLLOMB
26e9b1790b
feat(er): allow multiple constraints on attributes
...
little changes in grammar to get a list of constraints (PK, FK or UK), so little changes in renderer to handle this list
2023-01-24 21:20:11 +01:00
ashishj
68609fd8d0
Merge develop in timeline branch
2023-01-11 18:13:26 +01:00
Olivier Leveau
e659601e03
Add Box support in Sequence Diagrams
2023-01-05 15:40:40 +01:00
Sidharth Vinod
2c88c6b526
Merge pull request #3921 from tomperr/fix/3795_class_tilde_visibility
...
fix(generic): fix generic type detection
2022-12-24 00:33:39 +05:30
Alois Klink
a58b41a38e
Merge branch 'develop' into fix/3706_support-indented-yaml-only-in-html
2022-12-22 19:24:33 +00:00
Tom PERRILLAT-COLLOMB
df42f96b5a
docs(classDiagram): add nested generic type example in docs
2022-12-22 11:17:44 +01:00
Tom PERRILLAT-COLLOMB
2055f89bf7
feat(flowchart): add classDef group definition
...
enable to add styles to many classDef in a single statement
2022-12-17 11:34:44 +00:00
Tom PERRILLAT-COLLOMB
5705515483
fix(generic): fix generic type regex
...
instead of looking for single tildes, we are now looking for pairs, which avoid bugs when there is an odd number of tildes
2022-12-16 22:17:39 +00:00
Knut Sveidqvist
3e64b439ce
Merge pull request #3917 from tomperr/feature/3910_er_unique_key
...
feat(er): add unique key
2022-12-16 13:03:30 +01:00
Knut Sveidqvist
1bf636d697
Merge pull request #3892 from mahomedalid/feature/3771_string_length
...
Adding support for parenthesis in the er diagram attribute types.
2022-12-16 12:58:30 +01:00
Tom PERRILLAT-COLLOMB
32a8061cc2
feat(er): add UK attribute constraint
...
Any attribute can now be PK, FK or UK
2022-12-15 18:55:08 +00:00
ashishj
fefcc43dd4
Merged Develop in timeline branch
2022-12-15 17:10:56 +01:00
Maho Pacheco
07d8684fc7
Adding size to postal code
2022-12-11 19:34:25 -08:00
Ashley Engelund (weedySeaDragon @ github)
f0b8657423
state demo: AS descriptions for states in composites
2022-12-09 16:01:13 -08:00
Alois Klink
4cc3b17d36
docs(demos): fix indentation of YAML front-matter
...
Mermaid diagrams that have YAML front-matter can now be indented in
HTML code, see commit:
5cfa9196
(fix: support parsing indented mmd YAML from HTML, 2022-11-27)
Some diagrams previously had a mix of tabs/spaces for indentation.
In order for `dedent` to work, these diagrams had to be converted to
using a consistent indentation.
2022-11-27 18:29:28 +00:00
Ashley Engelund (weedySeaDragon @ github)
626a4741c0
Merge remote-tracking branch 'MERMAID/develop' into feat/3626-aria-descBy-roledescription-mocks
2022-11-25 11:30:44 -08:00
ashishj
0d5246fbc7
initial commit
2022-11-23 19:28:26 +01:00
Ashley Engelund (weedySeaDragon @ github)
7f5b48920c
update demos/state.html to includ examples; formatting
2022-11-22 08:56:04 -08:00
Per Brolin
9eb506f6c5
Revert "Added pie"
...
This reverts commit 1d9fefe7ac
.
2022-11-22 10:04:28 +01:00
Per Brolin
fdbc4ce0ed
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-11-21 14:45:25 +01:00
Knut Sveidqvist
29a02d1ab5
Merge pull request #3809 from aloisklink/use-dagre-d3-es
...
Replace `dagre`/`dagre-d3` with `dagre-d3-es`
2022-11-21 13:31:35 +01:00
Mason Malone
a11ab3d5ea
Disallow leading whitespace before delimiter
2022-11-19 12:52:49 -08:00
Mason Malone
70f024735b
Add title support using YAML frontmatter
2022-11-18 20:42:54 -08:00
Alois Klink
6e234f135d
docs: create some basic mermaid mindmap demos
2022-11-18 17:32:23 +00:00
Ashley Engelund (weedySeaDragon @ github)
68b1805c40
(minor) fix typo, whitespace formatting
2022-11-17 15:49:37 -08:00
Per Brolin
1d9fefe7ac
Added pie
2022-11-04 12:44:13 +01:00
Ashley Engelund (weedySeaDragon @ github)
599d035daf
merge MERMAID/develop into branch
2022-10-25 07:42:57 -07:00
Ivan Sinek
53bc747e9d
fix: gantt demo diagrams ( #3655 )
2022-10-17 14:42:48 +02:00
Ashley Engelund (weedySeaDragon @ github)
15dd60ab85
state demo: add more diagrams, add explanatory text
2022-10-11 08:34:30 -07:00
Ashley Engelund (weedySeaDragon @ github)
278a19f87a
state demo add classDefs to example with explanations; add some headers; update composite from docs
2022-10-11 08:33:43 -07:00
Sidharth Vinod
6e2deb1fa7
fix: Fix eslint warnings
2022-10-09 22:08:32 +08:00
Ashley Engelund (weedySeaDragon @ github)
fdb81be0a0
update demo diagrams to have lang, hr tags, src = mermaid.js where needed.
2022-10-02 13:51:25 -07:00
Knut Sveidqvist
ef527cb0fa
Merge branch 'develop' into feature/3171--erDiagram-allow-chars-in-entity-name
2022-09-28 13:24:54 +02:00
Knut Sveidqvist
edb30c9feb
Merge branch 'develop' into bug/3429_er-dark-theme-attribute-colors
2022-09-28 13:17:00 +02:00
Ashley Engelund (weedySeaDragon @ github)
7ed3c21a6d
move charts to their pages; index page just a list to them
2022-09-26 18:16:36 -07:00
Ashley Engelund (weedySeaDragon @ github)
3d0214d453
new page for pie charts
2022-09-26 18:16:00 -07:00
Ashley Engelund (weedySeaDragon @ github)
d0e9de2744
new page for context charts
2022-09-26 18:15:29 -07:00
Ashley Engelund (weedySeaDragon @ github)
99264fab8a
new page for git charts
2022-09-26 18:15:13 -07:00
Ashley Engelund (weedySeaDragon @ github)
ddc35fa9ce
a few more wee changes to the ER demo
2022-09-24 16:50:02 -07:00
Ashley Engelund (weedySeaDragon @ github)
5daa130857
er demo: clarify comment about name
2022-09-24 16:11:07 -07:00
Ashley Engelund (weedySeaDragon @ github)
ed0f22b037
Merge remote-tracking branch 'MERMAID/develop' into bug/er/allow-chars-in-entity-name
...
# Conflicts:
# vite.config.cts
# yarn.lock
2022-09-24 16:06:54 -07:00
Ashley Engelund (weedySeaDragon @ github)
eb1c6894f5
change demo ER diagram to include attributes, names with various chars
2022-09-24 16:05:59 -07:00
Ashley Engelund (weedySeaDragon @ github)
84dfc8ee4b
demos er.html add title, accDescription back in; simplify nearly to before
2022-09-22 12:26:36 -07:00
Ashley Engelund (weedySeaDragon @ github)
9cb7054ff9
add attributes to demo ER diagram so attribute styles can be evaluated
2022-09-22 11:48:11 -07:00
Sidharth Vinod
36ad4a847e
vite Server
2022-09-21 00:47:04 +05:30