Commit Graph

602 Commits

Author SHA1 Message Date
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 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
Knut Sveidqvist bf4272102d #3313 Packaging the thrown error in reconised structure 2022-08-11 18:24:14 +02:00
Knut Sveidqvist d32c8534cb Bugfix for empty blank lines 2022-08-09 18:39:20 +02:00
Knut Sveidqvist 9b54feab84 Merge branch 'develop' into minmaps 2022-08-06 10:53:54 +02:00
Knut Sveidqvist afe343e94f Changes after merge 2022-08-06 10:49:32 +02:00
ashishj 0ab152d644 Updated the integration test selectors 2022-08-04 19:40:51 +02:00
Knut Sveidqvist e6b410af04 Selector fixes for interaction tests 2022-08-04 19:26:34 +02:00
Knut Sveidqvist b0074bf723
Merge pull request #3222 from leon19/bugfix/incorrect-label-padding
fix: remove right padding when a label contains HTML entities
2022-08-04 13:06:46 +02:00
Knut Sveidqvist aa9149912d Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment 2022-08-04 13:05:17 +02:00
Muhammad Faisal Bin Arba'in 9ee43c0b7a snapshot test for more 8 branches with commits 2022-08-01 19:41:54 +08:00
Knut Sveidqvist ffe520db06 Curved edges 2022-07-29 15:06:21 +02:00
Knut Sveidqvist 00fe5d477d Different hanlding of icons for circles 2022-07-28 20:38:25 +02:00
Knut Sveidqvist 1a205aeccc Adding icon support 2022-07-27 18:40:44 +02:00
Knut Sveidqvist 82a480d924 Adding circle node type and class handling 2022-07-27 17:25:20 +02:00
Knut Sveidqvist 2d361964ce Better padding handling in nodes 2022-07-27 10:24:27 +02:00
Knut Sveidqvist 03d71829c6 Adding default node form 2022-07-27 09:43:25 +02:00
Lorens León c40368b0fa fix: remove right padding when a label contains HTML entities
Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length
2022-07-26 21:50:36 +02:00
Knut Sveidqvist 0b2ca29ae8 Theme support for mindmaps 2022-07-25 17:03:18 +02:00
Knut Sveidqvist f815bd08b7 Adjusting the width of the boxes based on the text in the boxes 2022-07-25 14:22:07 +02:00
Knut Sveidqvist 15f1cdf3aa Draft of edge rendering 2022-07-24 17:45:54 +02:00