Commit Graph

660 Commits

Author SHA1 Message Date
Knut Sveidqvist 5c71a3c85b #1110 Fix for transparent rect under edge title, was misaligned 2019-12-04 18:20:28 +01:00
Knut Sveidqvist 94e768dd01 #1110 Cleanup and removal of loggings 2019-12-04 18:04:56 +01:00
Knut Sveidqvist 0fb91d6bcc #1110 Fixing height issue 2019-12-03 23:38:51 +01:00
Knut Sveidqvist 346328156a #1110 Adding tests for this case and some calcuations for width 2019-12-02 21:10:37 +01:00
Knut Sveidqvist 71c531240f
Merge pull request #1089 from jgreywolf/1073-CommentsInClassDiagrams
Bug/1073 Comments in class diagrams
2019-12-01 00:39:33 +01:00
Knut Sveidqvist 50ea9bda89 Removed loggin 2019-11-28 11:41:54 -05:00
Justin Greywolf 753bd7e1d9 Update class diagrams to handle comments
updated regex in parser to correctly handle comments in class diagrams.  Also updated flowchart parser to remove unused elements for comments, as well as modifying the regex to match
2019-11-26 11:23:07 -08:00
Justin Greywolf b57492c1c6 Initial checkin 2019-11-26 11:22:21 -08:00
Knut Sveidqvist 5736d523dd
Merge pull request #1081 from jgreywolf/Bug1061-CannotMarkMembersAsProtectedInClassDiagram
Bug/1061 Cannot mark members as protected in class diagram
2019-11-21 20:54:15 +01:00
Justin Greywolf 5004b5723d Added separate render test 2019-11-21 11:17:53 -08:00
Knut Sveidqvist f6028b63b6 #1078 Using the configuration of the arrowMarkerAbsolute 2019-11-20 19:06:46 +01:00
Justin Greywolf 68c2ea38c9 Bug1061-CannotMarkMembersAsProtectedInClassDiagram
Using # to indicate protected status of a member or method causing parser error when not used inside class declaration brackets {}.  Removed '#' from `LABEL` regex
2019-11-19 12:49:59 -08:00
Knut Sveidqvist 3f8f9f6711 #1055 Better selectors 2019-11-08 20:15:48 +01:00
Knut Sveidqvist d01f494277 Merge branch 'master' into develop 2019-11-08 19:32:54 +01:00
Knut Sveidqvist 4db525c6a9 #1050 Merge of PR 2019-11-08 11:42:26 +01:00
Knut Sveidqvist e313625ccb Fixing the conflict 2019-11-08 08:54:48 +01:00
Ashish Jain 5b5be40dd5 Fixing the binding function error 2019-11-07 22:09:34 +01:00
Knut Sveidqvist fa7d1ac554 #1023 Fix for interaction tests 2019-11-07 19:42:09 +01:00
Knut Sveidqvist 09bf54f9af #1038 Updated prefix for the internal dom id 2019-11-07 19:14:06 +01:00
MATSUDA Takashi 7208f045c1 add test for multiple class diagram 2019-11-05 17:54:52 +09:00
MATSUDA Takashi f7a3c42da1 e2e support multiple diagram 2019-11-05 17:54:52 +09:00
Ashish Jain e4a2d2a290 Updated Jest test cases for Pie diagram 2019-10-30 18:29:26 +01:00
Knut Sveidqvist 034a7c424d #1033 Better handling of multiline notes 2019-10-27 17:16:29 +01:00
Knut Sveidqvist b113436055 #1033 Fix for diagram bounds and viewbox 2019-10-27 16:58:32 +01:00
Knut Sveidqvist a5cc1e804b #1031 Adding stricter code checks 2019-10-27 15:24:56 +01:00
Knut Sveidqvist d1c74070ab #1029 Fix for issues after switching to master branch of dagre-d3 2019-10-24 19:33:13 +02:00
Knut Sveidqvist 66152b42ae #1023 New line in transition labels, basic support 2019-10-23 21:16:59 +02:00
Knut Sveidqvist 4a1eb55127 #1022 Fix for long names for state diagrams 2019-10-23 19:22:36 +02:00
Knut Sveidqvist 0ce42e6185
Merge pull request #994 from edekadigital/bug-478
#478 API crashes on 2nd render() call
2019-10-15 19:40:29 +02:00
Kolja Markwardt d743838716 #478 API crashes on 2nd render() call
- add e2e test for (re)rendering by api
2019-10-15 17:36:02 +02:00
Knut Sveidqvist 047ce2949a #989 Added font styling classes to diagrams lacking then 2019-10-13 19:16:35 +02:00
Knut Sveidqvist 53bdfee057 #989 Font configuration 2019-10-12 16:53:21 +02:00
Knut Sveidqvist 2da55993e0 Test of font-settings for correct image snapshots 2019-10-12 09:16:33 +02:00
Knut Sveidqvist 7a7c09493c Adding more info about documentation and moving the contributing file to its proper place 2019-10-11 08:17:39 +02:00
Knut Sveidqvist f3d588eca5 Adding contributing information 2019-10-11 08:10:54 +02:00
Knut Sveidqvist 85e58faa78 #945 White background and forks in composite mode 2019-10-10 17:57:29 +02:00
Knut Sveidqvist 54e6e2f66e #945 Some bug fixes and draft docs 2019-10-09 20:05:24 +02:00
Knut Sveidqvist fe1e09f06b Merge branch 'feature/945_state_diagrams' 2019-10-09 18:16:32 +02:00
Ashish Jain aaac86fd9d #949 Added cypress test case for class diagram cardinality support 2019-10-08 21:46:03 +02:00
Ashish Jain 6b4a8325ae Merge branch 'feature/963_class_annotations' of https://github.com/chris579/mermaid into develop 2019-10-08 12:49:52 +02:00
Knut Sveidqvist ce0b0fa0c8 #945 Divider lines for concurrency 2019-10-06 15:44:31 +02:00
Knut Sveidqvist dce09586cd #945 Support for forks and joins 2019-10-06 14:11:17 +02:00
Knut Sveidqvist 4f1186a610 #945 Support for notes, better width and handling of +/- 2019-10-06 11:35:46 +02:00
Knut Sveidqvist 1cb52a602a #945 Support for notes 2019-10-06 10:52:37 +02:00
Knut Sveidqvist 3b731282e3 #945Renabling support for descriptions 2019-10-05 12:15:14 +02:00
Knut Sveidqvist d4306e61c2 #945 Some cleanup 2019-10-05 09:02:20 +02:00
Christian Klemm 92eec664b1
test fix 2019-10-05 00:57:58 +02:00
Christian Klemm 723fe84383
added diagram escaping for e2e tests 2019-10-05 00:39:07 +02:00
Christian Klemm 3ca9347361
test fix 2019-10-05 00:05:47 +02:00
Christian Klemm 704d36a7eb
adjusted integration test 2019-10-04 23:58:06 +02:00
Knut Sveidqvist 65cbfbdb40 #945 Tweaking 2019-10-03 19:54:07 +02:00
Knut Sveidqvist 7865fd4f02 #945 Rendering of composite state in a box 2019-10-03 19:08:15 +02:00
Knut Sveidqvist f9f8785aef #945 Recursive object from parsing and stateDb 2019-10-02 19:32:13 +02:00
Knut Sveidqvist 94afcfb6f9 #945 Rendering of state descriptions 2019-09-29 15:50:43 +02:00
Knut Sveidqvist 3cffd1e3ed #945 Rendering of labels and new label positioning algorithm 2019-09-28 13:31:10 +02:00
Knut Sveidqvist fad76ad534 #945 Rendering of start & end node 2019-09-25 21:01:21 +02:00
Knut Sveidqvist 244be86207 E2e test of interaction in graphs 2019-09-18 19:42:19 +02:00
Knut Sveidqvist 21622f575b Updating cypress tests 2019-09-18 18:25:06 +02:00
Ashish Jain 42fc23cff2 #22 Basic Pie Chart 2019-09-11 21:20:28 +02:00
Knut Sveidqvist 9f87ab4941 #927 Adding support for cypress and Percy 2019-09-11 18:53:05 +02:00