marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-04 04:44:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,140 Commits 232 Branches 190 Tags
8ed7d2201010ccbebb5b5702fc9f7cd005f3739a
Commit Graph

3140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bastian Zimmermann
8ed7d22010 Updated copyright years 
Changed 2018 - 2020
 2020-12-02 16:49:09 +01:00
Knut Sveidqvist
96ac13cdac Merge branch 'master' into develop 2020-11-26 19:25:57 +01:00
Knut Sveidqvist
d409006a44 Merge remote-tracking branch 'origin/develop' into develop 2020-11-26 19:22:26 +01:00
Knut Sveidqvist
2e7452f067 Lint fix 2020-11-26 19:15:45 +01:00
Ashish Jain
ddc31870bf Merge pull request #1786 from JiChao99/patch-1 
remove classDiagram duplicate options
 2020-11-26 19:10:22 +01:00
Knut Sveidqvist
77d6048005 #1771 Fixed broken link 2020-11-26 19:09:39 +01:00
Knut Sveidqvist
8748e661e8 Merge pull request #1796 from kciter/bug/fix_markdown_bug 
Fixed markdown error in Relationship Syntax
 2020-11-26 18:59:31 +01:00
Knut Sveidqvist
a50086ddec Merge pull request #1789 from mermaid-js/dependabot/npm_and_yarn/highlight.js-9.18.5 
Bump highlight.js from 9.18.1 to 9.18.5
 2020-11-26 18:57:53 +01:00
Knut Sveidqvist
465fa571d2 Merge pull request #1787 from julianbei/feature/727_deterministic_svg_ids 
Add different id generators
 2020-11-26 18:56:58 +01:00
Lee Sun-Hyoup
d72ba16664 Fixed markdown error in Relationship Syntax 2020-11-26 14:25:22 +09:00
dependabot[bot]
efd14f4c24 Bump highlight.js from 9.18.1 to 9.18.5 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-25 00:41:08 +00:00
Julian Amelung
c472024921 Add test cases for utils.initIdGeneratior 2020-11-23 23:54:00 +01:00
Julian Amelung
35cd3918df Add different id generators 2020-11-23 23:05:41 +01:00
alec ji
a2a0851978 remove classDiagram duplicate options 
remove classDiagram `#Multiplicity on relations` duplicate options
 2020-11-21 02:42:27 +00:00
Knut Sveidqvist
b329679d2d Merge pull request #1773 from tomatoman25/bug/1759_state_notes 
Changed regex for multi-line state notes
 2020-11-19 17:48:53 +01:00
Knut Sveidqvist
39657e6537 Merge pull request #1784 from gwatts/patch-1 
Add Doscy to list of integrations
 2020-11-19 17:48:02 +01:00
Knut Sveidqvist
ee99d15df4 Merge pull request #1772 from glensc/babel-dev-dep 
Move babel-eslint to devDependencies
 2020-11-19 17:47:29 +01:00
Gareth Watts
813b993819 Add Doscy to list of integrations 
Docsy includes support for Mermaid in the theme.
 2020-11-18 21:57:12 -06:00
GDFaber
f62189b381 Merge pull request #1781 from mermaid-js/bug/1751_flowchart_subgraph_styles 
Apply style settings to subgraphs in "flowchart" diagrams
 2020-11-18 00:42:30 +01:00
GDFaber
dfa306c8c2 Merge pull request #1782 from mermaid-js/bug/1742_replace_console_log_with_logger_info 
Narrow down console logging when flowchart subgraphs are added
 2020-11-18 00:40:29 +01:00
GDFaber
df7e90f4b5 Merge pull request #1780 from manicki/bug/typo_lagom_explanation 
Fixed typo in the docs
 2020-11-18 00:39:54 +01:00
Marc Faber
55532c00b4 Revert updates on integration tests due to failing PR tests 2020-11-18 00:34:02 +01:00
Marc Faber
7ea18f5462 #1742 narrow down console logging when flowchart subgraphs are added 2020-11-18 00:02:10 +01:00
Marc Faber
a16bbb8046 #1751 apply style settings to subgraphs in "flowchart" diagrams 2020-11-17 23:18:11 +01:00
Leszek Manicki
1d30241871 Fixed typo in the docs 2020-11-17 20:40:16 +01:00
Marc Faber
a0e5ec1d13 Merge branch 'bug/1423_ignore_build_files_in_dist' into develop 2020-11-17 15:50:25 +01:00
Marc Faber
830620740a Unix line endings 2020-11-17 15:44:00 +01:00
GDFaber
d34e8c4336 Merge pull request #1777 from mermaid-js/bug/1423_ignore_build_files_in_dist 
ignore build files in dist folder
 2020-11-17 14:54:45 +01:00
Marc Faber
2370531e75 #1423 ignore build files in dist folder 2020-11-17 14:48:48 +01:00
Marc Faber
06f74a8c15 updated integration tests 2020-11-17 14:34:48 +01:00
GDFaber
e0ad5eaf5e Merge pull request #1776 from mermaid-js/bug/1767_add_sansserif_to_default_fonts 
Add sans-serif to default font settings
 2020-11-17 13:11:35 +01:00
Marc Faber
067f356010 #1767 Add sans-serif to default font settings 2020-11-17 11:36:34 +01:00
Neil Cuzon
555a38b819 Update mermaidAPI.js 2020-11-15 13:52:21 -08:00
Neil Cuzon
88f2ede8fe Update usage.md 2020-11-15 13:51:45 -08:00
Neil Cuzon
9b2f61d778 Update flowchart.md 2020-11-15 13:44:47 -08:00
Marc Faber
0801047fe6 added a file for graph<->flowchart comparisons to dist folder 2020-11-15 19:22:55 +01:00
Neil Cuzon
f8b8d03e15 Add files via upload 2020-11-15 07:57:22 -08:00
Neil Cuzon
f4270a0d75 Delete GitHub-Mark-32px.png 2020-11-15 07:57:08 -08:00
Neil Cuzon
0ab629e32d Add files via upload 2020-11-15 07:56:15 -08:00
Neil Cuzon
4259611726 Add files via upload 2020-11-15 07:34:36 -08:00
Neil Cuzon
24e2429fc0 Add files via upload 2020-11-15 07:34:05 -08:00
Neil Cuzon
ebf046ebc0 Delete GitHub-Mark-32px.png.png 2020-11-15 07:33:31 -08:00
Neil Cuzon
0155171c0d Add files via upload 2020-11-15 07:24:37 -08:00
Neil Cuzon
5a92b77560 Update flowchart.md 2020-11-15 07:19:13 -08:00
Marc Faber
0604b1a822 Merge branch 'forkgroup-docs/update_edit_this_page' into develop 2020-11-15 16:15:14 +01:00
Marc Faber
d54f3afe25 Merge branch 'docs/update_edit_this_page' of https://github.com/forkgroup/mermaid into forkgroup-docs/update_edit_this_page 2020-11-15 16:13:42 +01:00
Neil Cuzon
acc2392c3d Update mermaidAPI.js 2020-11-15 05:00:54 -08:00
Neil Cuzon
3044c63773 Update usage.md 2020-11-15 04:51:33 -08:00
Neil Cuzon
f963238a75 Update mermaidAPI.js 2020-11-15 03:45:20 -08:00
Neil Cuzon
46d41ba67a Update n00b-gettingStarted.md 2020-11-15 03:25:02 -08:00