Commit Graph

1776 Commits

Author SHA1 Message Date
Justin Greywolf 6fdf30357c 1104-Add support to designate a method as abstract
Added logic to allow rendering of a method name with italics or underline based on modifier at beginning of name to set css style
2019-12-09 17:41:26 -08:00
Justin Greywolf cf5d7478fc
Merge pull request #6 from mermaid-js/develop
Merge
2019-12-09 11:42:26 -08:00
Christian Klemm 08cbc0f187
Merge pull request #1129 from mermaid-js/master
Master sync
2019-12-08 13:14:32 +01:00
Knut Sveidqvist d8251c8f79
Merge pull request #1126 from mermaid-js/bug/935_styling_of_dotted_think_links
#935 Fix for stylink of links. Default theme colors are picked up and…
2019-12-08 10:51:28 +01:00
Knut Sveidqvist d23ce9fb63 #935 Fix for stylink of links. Default theme colors are picked up and styling via themeCSS works 2019-12-08 10:10:03 +01:00
Knut Sveidqvist ddf8016a0c
Merge pull request #1125 from mermaid-js/bug/903_flochart_escaping_in_non_html_mode
Bug/903 flowchart escaping in non html mode
2019-12-08 09:57:48 +01:00
Knut Sveidqvist ab191abd5a #903 Fix for broken build 2019-12-07 15:06:44 +01:00
Knut Sveidqvist c2e5e94b37 #903 Allowing >,< and = characters in svg. Updating xss tests to handle both htmlLabels and non htmlLabels 2019-12-07 12:19:45 +01:00
Justin Greywolf 91d986970b
Merge pull request #5 from mermaid-js/develop
Develop
2019-12-05 12:58:48 -08:00
Christian Klemm b4192bba7a
Added skip changelog label to release drafter 2019-12-04 19:35:25 +01:00
Knut Sveidqvist 9fe0aa0604
Merge pull request #1116 from mermaid-js/bug/1110_state_diagram_rendering_composit_state
Bug/1110 state diagram rendering composit state
2019-12-04 19:15:06 +01:00
Knut Sveidqvist fc528749f8
Merge pull request #1114 from mermaid-js/feature/1112_revert_offical_dagre_d3
Feature/1112 Revert to offical dagre d3
2019-12-04 19:14:35 +01:00
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 02854881b4 #1110 Zoom in a bit 2019-12-03 22:48:55 +01:00
Christian Klemm 4254781391
Adjusted imports 2019-12-03 22:09:43 +01:00
Christian Klemm 31f4f4096e
upgraded packages 2019-12-03 22:05:39 +01:00
Christian Klemm e95e016378
switched to official dagre d3 2019-12-03 21:59:28 +01:00
Knut Sveidqvist c337c9128c Merge branch 'master' into bug/1110_state_diagram_rendering_composit_state 2019-12-03 21:04:18 +01:00
Knut Sveidqvist 5a38562bfc #1110 Handling case with concurrency lines 2019-12-03 20:59:17 +01:00
Justin Greywolf a3dd0e5f7d
Merge pull request #4 from mermaid-js/develop
Merge from main
2019-12-02 16:00:32 -08:00
Knut Sveidqvist fcd1e106a5 #1110 Handling case when title is less wide then subgraph 2019-12-02 21:22:22 +01:00
Knut Sveidqvist 346328156a #1110 Adding tests for this case and some calcuations for width 2019-12-02 21:10:37 +01:00
Christian Klemm 3239f99ea8
Set develop branch for release drafter 2019-12-02 14:48:16 +01:00
Christian Klemm 93c32d3f29
Set develop branch for release drafter 2019-12-02 14:47:34 +01:00
Christian Klemm 98449dac3f
Set develop branch for release drafter 2019-12-02 14:43:55 +01:00
Knut Sveidqvist 32b60edda7 Merge branch 'develop' 2019-12-01 13:36:04 +01:00
Knut Sveidqvist 823c95bd9c Updated mermaid version 2019-12-01 13:34:43 +01:00
Knut Sveidqvist e99d872f2b
Create FUNDING.yml 2019-12-01 09:15:56 +01:00
Knut Sveidqvist de8f8b02dc Merge branch 'master' into develop 2019-12-01 07:54:02 +01:00
Knut Sveidqvist eec45dfff9 Merge branch 'release/8.4.3' 2019-12-01 07:52:44 +01:00
Knut Sveidqvist cce86c8e96
Merge pull request #1107 from chris579/feature/1106_release_management
Feature/1106 Release management
2019-12-01 07:34:59 +01:00
Christian Klemm aabdc47c38
small fixes 2019-12-01 01:06:00 +01:00
Knut Sveidqvist cb07a729e5
Merge pull request #1098 from mermaid-js/feature/1053_documentation-update
Feature/1053 documentation update
2019-12-01 00:42:41 +01:00
Knut Sveidqvist df10f7fbe7
Merge pull request #1103 from penenkel/patch-2
Bug/1030 Adjust babel config to account for IE11
2019-12-01 00:42:02 +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
Christian Klemm 1e83207dac
small fixes 2019-12-01 00:39:09 +01:00
Christian Klemm 3311fcdc8e
Reenable yarn install 2019-12-01 00:21:12 +01:00
Christian Klemm f368be925f
Removed release branch deletion 2019-12-01 00:18:49 +01:00
Christian Klemm 075c57ca06
Check out branches 2019-12-01 00:03:06 +01:00
Christian Klemm 49fc80d506
Prepare git for push 2019-11-30 23:54:42 +01:00
Christian Klemm 74fc2fcfa9
Release tag fixes 2019-11-30 23:49:04 +01:00
Christian Klemm 7cc427e28d
Disable yarn install 2019-11-30 23:36:13 +01:00
Christian Klemm 87c571412c
version fix 2019-11-30 23:35:39 +01:00
Christian Klemm ab093b2cde
Remove v from release tag 2019-11-30 23:28:48 +01:00
Christian Klemm bbc4ede768
Added first workflows 2019-11-30 23:23:09 +01:00
penenkel 64c20dc528
Bug/1030 Adjust babel config to account for IE11
An attempt at adding IE11 compatibility (`ie >= 11`) while preserving the current requirements (`current node`) and following browserlist [best practices](https://github.com/browserslist/browserslist#best-practices) (`defaults`).
2019-11-29 23:06:49 +01:00
Knut Sveidqvist 50ea9bda89 Removed loggin 2019-11-28 11:41:54 -05:00
Nacho 2cf8c4e37a Absolute URIs in readme images 2019-11-28 11:41:54 -05:00