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

621 Commits

Author SHA1 Message Date
Sidharth Vinod
dab43da202
fix: imports in HTML 2022-09-20 22:13:49 +05:30
Ashish Jain
a266a9c539
Merge pull request #3479 from elliot-nelson/enelson/git-cherry-pick-tag 
feat(git): cherry-pick keyword supports tag attribute
 2022-09-20 17:38:01 +02:00
Knut Sveidqvist
7635db4c1e
Merge pull request #3454 from mermaid-js/3409_Truncated_Tags 
3409 Fix for truncated tags in GitGraph
 2022-09-19 08:28:41 +02:00
Elliot Nelson
4e4b5ccf8d feat(git): allow cherry-pick to suppress tag altogether 2022-09-18 09:22:35 -04:00
Elliot Nelson
ae920eaa93 feat(git): cherry-pick keyword supports tag attribute 2022-09-17 23:57:32 -04:00
Alois Klink
e8eb2ab03f
Merge pull request #3459 from aloisklink/chore/update-cypress 
Update Cypress to v10 and fix E2E errors
 2022-09-16 17:32:10 +01:00
Knut Sveidqvist
9c88c785cb Fix for issues in errorhandling and class diagrams after refactoring 2022-09-16 14:05:15 +02:00
ashishj
4c5d813e58 Fixed Linting issues 2022-09-16 09:25:22 +02:00
Sidharth Vinod
539ee49594
Merge remote-tracking branch 'origin/release/9.1.7' into sidv/mergeRelease 
* origin/release/9.1.7:
  Release 9.1.7
  Fix for broken rendering test
  Fix for issue #3428, load the configured diagrams even when initialize has not been called.
 2022-09-14 11:11:12 +05:30
Alois Klink
625ec813b9 chore: upgrade cypress to v10 
Cypress v10 had some minor breaking changes,
(e.g. the cypress/plugins folder dissapeared)
so I had to change some things.

It looks like the Cypress was previously reverted in [dee9cfe][1],
due to applitools not working properly,
but I think my changes fix this, so it should be okay.

[1]: dee9cfea85
 2022-09-14 04:15:52 +01:00
Alois Klink
595f7680e9 fix(flowchart-v2): fix arrowMarkerAbsolute=true 
The if-check for arrowMarkerAbsolute in the flowchart-v2 code is in
dagre-wrapper. Unfortunately, I can't seem to find a way to find the
local conf (e.g. the one set via `flowRenderer.setConf()`, so instead
I'm using global mermaid config from `src/config`.

Flowchart v1 arrowMarkerAbsolute=true is still broken, but I'm not
really sure how to fix that.
 2022-09-14 04:15:52 +01:00
Alois Klink
6e7037bafd test(e2e): fix most arrowMarkerAbsolute tests 
The arrows between flowcharts do not have the class edgePath.

Instead, I'm loading all `<path>`s within the `<g class='edgePaths'>`
 2022-09-14 04:15:52 +01:00
Alois Klink
a25c9a30d0 text(e2e): give git tests consistent commit id 
gitGraph render tests are currently using random commit ids,
which causes visual regression tests to fail.

I couldn't find a way to make the random commit IDs consistent
(JavaScript/Cypress doesn't seem to have a random.seed() function),
so I've just hardcoded all the commit ids.
 2022-09-14 04:15:52 +01:00
Alois Klink
05b8a6e77f test(e2e): widen flowchart width to within 10% 
Widen flowchart width acceptable values to within 10% of 300px.
On my local environment, I'm getting 283px, which is 5.5% of 300px.
 2022-09-14 04:15:52 +01:00
Alois Klink
f05c790248 test(e2e): fix failing xss9 test 
Fixes xx9 test to continue running even if JavaScript throws an
exception.
 2022-09-14 04:15:52 +01:00
ashishj
d60ce53e05 #3409 Fixed the truncated tags issue 2022-09-13 18:23:24 +02:00
Knut Sveidqvist
fc9d22562b Creating detectors and moving out diagram specific code from the diagramAPI 2022-09-10 15:53:50 +02:00
Sidharth Vinod
9d0901801b
Suppress errors 2022-09-09 18:26:57 +05:30
Knut Sveidqvist
47490e9820 Lint fixes 2022-09-05 15:57:12 +02:00
Knut Sveidqvist
df7b5965c2
Merge branch 'develop' into minmaps 2022-09-05 15:35:24 +02:00
Knut Sveidqvist
8ad5f728c0 Removing requirement to add ids for nodes with a shape 2022-09-05 14:53:01 +02:00
Knut Sveidqvist
8b4a08eef4 #3336 Merged typescript changes 2022-09-05 14:04:39 +02:00
Knut Sveidqvist
01106caa59 Merged typescript changes 2022-09-05 11:22:17 +02:00
Knut Sveidqvist
047b7023a2 Updated with cloud and bang shapes 2022-09-05 09:54:00 +02:00
Sidharth Vinod
98e9f5751a
Prettier pass 2022-09-05 01:00:47 +05:30
Sidharth Vinod
41dec4d159
Fix XSS htmls 2022-09-05 00:57:34 +05:30
Sidharth Vinod
91478caf5b
fix #3407 Replace div with pre and format 2022-09-05 00:48:36 +05:30
Knut Sveidqvist
5584fef1b0 #3395 Renabling the error graph which is rendered on error 2022-09-02 14:05:31 +02:00
Knut Sveidqvist
ccb16e5f5a Adding cloud and bang shapes 2022-09-02 11:08:26 +02:00
Knut Sveidqvist
ac76fb73a8
Merge pull request #3360 from vallsv/feature-ms-duration 
Feature decimal duration in second for gantt diagram
 2022-09-01 16:23:42 +02:00
Knut Sveidqvist
68f8010ab9 Merge branch 'develop' into minmaps 2022-09-01 13:42:21 +02:00
Knut Sveidqvist
63c385a5d7 Adding some rendering tests 2022-08-30 21:36:17 +02:00
ashishj
a93f37a3fc #3238 Updated documentation 2022-08-30 19:25:22 +02:00
ashishj
dd40b19c89 #3238 Added more rendering test cases 2022-08-30 18:37:13 +02:00
Ashish Jain
d7e0888801
Merge pull request #3361 from aloisklink/feature/3356_git_custom_merge_commit_id 
feat(git): allow custom merge commit ids
 2022-08-30 17:50:57 +02:00
Knut Sveidqvist
4cdc6e4a0d Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps 2022-08-28 14:25:15 +02:00
Knut Sveidqvist
f350ff9852 Merge branch 'minmaps' of github.com:mermaid-js/mermaid into minmaps 2022-08-28 14:25:02 +02:00
Knut Sveidqvist
6ab0eef6f3 Merge branch 'develop' 
Conflicts:
	cypress/platform/knsv.html
 2022-08-28 14:22:56 +02:00
Knut Sveidqvist
080bde0bc2 #2824 Updated regressionstest afters diagram sizing changes 2022-08-28 11:39:22 +02:00
Knut Sveidqvist
e6e7bdcb55 #2824 Size changes and updated regressionstest afters diagram sizing changes 2022-08-28 11:25:09 +02:00
Knut Sveidqvist
2968b400c4 Updated viewBox settings 2022-08-27 15:03:29 +02:00
Knut Sveidqvist
d0d5739ab0 Merge branch 'develop' into minmaps 2022-08-27 12:35:30 +02:00
Knut Sveidqvist
0779c39654 Border 2022-08-27 12:32:33 +02:00
Alois Klink
b2f5ba3ee8
feat(git): allow custom merge commit ids 
Currently, merge commits can have a git tag, but they cannot have a
custom git commit ID.

This commit allows modifying the default merge commit id.
It also displays all merge commits IDs, which undoes
3ccf027f42
 2022-08-25 23:42:39 +01:00
Valentin Valls
3315ae8382 Supports duration in decimal 2022-08-25 23:15:28 +02:00
Valentin Valls
0583c4fa25 Added 'ms' duration 2022-08-24 22:26:39 +02:00
Knut Sveidqvist
c50745323a
Merge pull request #3335 from FlorianWoelki/feature/3171_erDiagram_more_symbols 
Add generic and array symbols to `erDiagram`
 2022-08-23 20:07:06 +02:00
Knut Sveidqvist
280c7e8da1 #3243 Adding disabled testcase for diagram with leading \n 2022-08-21 11:05:13 +02:00
FlorianWoelki
19a9f90186 test(e2e): add array and generic attributes erDiagram test 2022-08-20 15:15:05 +02:00
Knut Sveidqvist
1befbe08ff #3308 Allowing br tags in tooltips 2022-08-18 19:11:33 +02:00