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
4,188 Commits 182 Branches 159 Tags
Commit Graph

4188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Knut Sveidqvist
be0dd22fa5 Merge branch 'master' into develop 2021-12-08 07:54:46 +01:00
Knut Sveidqvist
1385acc3f6 Merge branch 'release/8.13.5' 2021-12-08 07:54:06 +01:00
Knut Sveidqvist
7da80812e0 Release 8.13.5 real-8.13.5 2021-12-08 07:53:37 +01:00
Knut Sveidqvist
2ce18ec2a8
Merge pull request #2542 from mermaid-js/2541 
Fix for issue
8.13.5 		2021-12-07 23:09:20 +01:00
Knut Sveidqvist
831110029c Merge branch 'HEAD' into 2541 2021-12-07 22:56:01 +01:00
Knut Sveidqvist
89ce930de2 Adding integration test 2021-12-07 22:55:28 +01:00
Knut Sveidqvist
f69f770043 dep fix 2021-12-07 22:09:38 +01:00
Knut Sveidqvist
a97b2cc4da #2541 Sanitizing the label string in class diagrams 2021-12-07 21:55:33 +01:00
Knut Sveidqvist
25b70d8058 Merge remote-tracking branch 'origin/develop' into develop 2021-12-07 21:48:56 +01:00
Knut Sveidqvist
bd106e4aec
Merge pull request #2522 from mermaid-js/eslint-husky 
setup lint-staged and husky
 2021-12-07 09:36:57 +01:00
Lukas Klingsbo
b7abaf1e47
Change "Help wanted!" to "Good first issue!" shield (#2533) 2021-12-05 13:10:41 -08:00
dependabot[bot]
4fea702347
Bump webpack-dev-server from 4.5.0 to 4.6.0 (#2515) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-12-04 15:30:42 -08:00
Yash-Singh1
3ea974709f chore: apply linting to html ext too and fixes for files 2021-12-04 15:28:40 -08:00
Matthieu MOREL
6681216889
Delete Renfay.md 2021-12-04 14:29:51 +01:00
Matthieu MOREL
189d3434b2
Delete todo.md 2021-12-04 14:29:35 +01:00
MOREL Matthieu
c11f9b7e5f lint html : enable eslint-plugin-html 2021-12-04 13:50:21 +01:00
MOREL Matthieu
80b14d1d7f lint markdown : enable eslint-plugin-markdown 2021-12-04 13:10:39 +01:00
MOREL Matthieu
ae5e15c046 ci commitlint : setup commitlint 2021-12-04 12:58:00 +01:00
Matthieu MOREL
8574dadc34
move jison folder into src folder 2021-12-04 11:51:08 +01:00
Knut Sveidqvist
e6cf1f2602
Merge pull request #2389 from maiermic/feature/1893_data_flow_diagrams 
Feature/1893 data flow diagrams
 2021-12-01 18:48:09 +01:00
Knut Sveidqvist
9a729257f2 Merge branch 'maiermic-feature/1893_data_flow_diagrams' into develop 2021-12-01 18:14:10 +01:00
Knut Sveidqvist
492ecb1099 merge 2021-12-01 18:12:05 +01:00
Yash-Singh1
ab17af274d chore: install husky hooks on install 2021-11-30 17:08:10 -08:00
Yash-Singh1
59e0a8e1b5 Merge branch 'develop' of github.com:mermaid-js/mermaid into eslint-husky 2021-11-30 17:05:10 -08:00
Yash-Singh1
c232bee95f chore: resolve conflicts by rebuilding 2021-11-30 17:02:58 -08:00
Matthieu MOREL
837eeb6d01
test are already executed on push and pull request 2021-11-30 23:18:48 +01:00
Knut Sveidqvist
3426aa8b2a Lint fix 2021-11-30 20:41:57 +01:00
Knut Sveidqvist
3526e35012 Fix for node with wrong type 2021-11-30 20:28:51 +01:00
Knut Sveidqvist
a018789026 Merge remote-tracking branch 'origin/develop' into develop 2021-11-30 19:24:10 +01:00
Knut Sveidqvist
d9e598aa7f testcommit 2021-11-30 19:12:39 +01:00
Matthieu MOREL
27027d003b setup lint-staged and husky 
Co-Authored-By: Yash Singh <saiansh2525@gmail.com>
 2021-11-30 08:49:37 +01:00
dependabot[bot]
89eea0536d
Bump eslint-plugin-jest from 25.2.4 to 25.3.0 (#2519) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 20:18:52 -08:00
dependabot[bot]
4679daafcf
Bump eslint from 8.2.0 to 8.3.0 (#2518) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 18:02:07 -08:00
dependabot[bot]
a0c6160e55
Bump prettier from 2.4.1 to 2.5.0 (#2520) 
Bumps [prettier](https://github.com/prettier/prettier) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.4.1...2.5.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 12:24:29 -08:00
Knut Sveidqvist
f887420818
Merge pull request #2521 from pbendersky/bug/1342-spaces-in-state-name 
Changed logic to render states with spaces in names to fix regressions.
 2021-11-29 17:55:56 +01:00
Pablo Bendersky
31851b2e30
Fixed eslint error 2021-11-29 13:02:38 -03:00
Pablo Bendersky
08702565f7
Changed logic to render states with spaces in names to fix regressions. 2021-11-29 11:57:59 -03:00
Knut Sveidqvist
5d99ac7d8d
Merge pull request #2502 from mermaid-js/prLabelerValidator 
Pr labeler config validator
 2021-11-29 07:57:17 +01:00
Knut Sveidqvist
d19be0b940
Merge pull request #2501 from pbendersky/bug/1342-spaces-in-state-name 
Fixes rendering of state names with spaces
 2021-11-29 07:56:35 +01:00
Knut Sveidqvist
b7115b804c
Merge pull request #2500 from mmorel-35/develop 
Enable eslint-plugin-jest, eslint-plugin-cypress and wider scan
 2021-11-29 07:55:08 +01:00
Michael Maier
28bb07d415 fix: check if node.prop is defined 2021-11-28 15:35:56 +01:00
Michael Maier
c2db1d4d44 add missing semicolon 2021-11-28 12:44:22 +01:00
Michael Maier
b6d3ac8e32 warn if unknown node property is given 2021-11-28 12:38:51 +01:00
Michael Maier
9e8c03cb49
Merge branch 'develop' into feature/1893_data_flow_diagrams 2021-11-28 12:26:39 +01:00
Michael Maier
5fff8403a8 add borders example 2021-11-28 12:24:24 +01:00
Michael Maier
86810e04bd Revert "add shape datastore (for nodes of data flow diagram)" 
This reverts commit cd427ab8ba7ada02f33870720be9b28ee8674ed5.
 2021-11-28 12:17:05 +01:00
Michael Maier
ee3680eb6d update syntax of data flow diagram example 2021-11-28 12:17:04 +01:00
Michael Maier
984a5084b0 render node property borders of rect node 2021-11-28 12:13:48 +01:00
Michael Maier
853d62c8d1 add props of vertex to node 2021-11-28 12:12:39 +01:00
Michael Maier
0550e4a899 add props to vertex 2021-11-28 12:11:50 +01:00