Commit Graph

3087 Commits

Author SHA1 Message Date
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
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
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
0ab629e32d Add files via upload 2020-11-15 07:56:15 -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
46d41ba67a Update n00b-gettingStarted.md 2020-11-15 03:25:02 -08:00
Neil Cuzon
55073bd891 Add files via upload 2020-11-15 03:19:33 -08:00
Neil Cuzon
93ddc0b4f5 Delete liveEditorOptions.png 2020-11-15 03:14:49 -08:00
Neil Cuzon
a74fc5aac7 Delete n00b-Confluence1.png 2020-11-15 03:14:38 -08:00
Neil Cuzon
e1032498e2 Delete n00b-Confluence2.png 2020-11-15 03:14:32 -08:00
Neil Cuzon
f43e07bc68 Delete n00b-Confluence3.png 2020-11-15 03:14:25 -08:00
Neil Cuzon
e61207ab41 Delete n00b-Confluence4.png 2020-11-15 03:14:18 -08:00
Neil Cuzon
0f87b1b5da Delete n00b-liveEditor.png 2020-11-15 03:14:11 -08:00
sy-records
cb41569a5a feat: Auto generation of Edit this Page 2020-11-15 10:28:47 +08:00
sy-records
6167f5d7b4 chore: update resources links and fix typo 2020-11-15 10:27:08 +08:00
GDFaber
b50a453fe0 Merge pull request #1764 from AloisMahdal/doc_df_table
Re-align gantt chart dateFormat table with spaces
2020-11-13 23:25:34 +01:00
Alois Mahdal
973b6fc355 Re-align gantt chart dateFormat table with spaces
With tabs, the table does not render in a readable way.  This commit is
replacing tabs with spaces.
2020-11-10 11:31:14 +01:00
Knut Sveidqvist
331c952212 Merge pull request #1757 from spopida/bug/1756_ERD_padding
Fix padding for entities with no attributes
2020-11-05 18:53:46 +01:00
Adrian Hall
879da091d3 Fix padding for entities with no attributes 2020-11-05 11:56:57 +00:00
Knut Sveidqvist
144cba7f10 Merge pull request #1755 from loris-intergalactique/develop
Fixed spelling errors
2020-11-04 19:24:50 +01:00
Knut Sveidqvist
ee4571071d Merge pull request #1750 from spopida/feature/1531_ERD_attributes
Feature/1531 erd attributes
2020-11-04 19:24:22 +01:00
LORIS INTERGALACTIQUE
47a3ca44ba Add scss path in docs 2020-11-04 16:59:28 +01:00
LORIS INTERGALACTIQUE
0e7ad3feeb Removed an incomplete line 2020-11-04 16:56:12 +01:00
LORIS INTERGALACTIQUE
bb6ba758db Fixed spelling errors 2020-11-04 16:52:28 +01:00
Adrian Hall
1ce4805bdc Merge branch 'develop' into feature/1531_ERD_attributes 2020-11-02 09:44:56 +00:00
Adrian Hall
ecdb66f65a Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop 2020-11-02 09:42:23 +00:00
Adrian Hall
ae1880311e Support attribute definitions for entities in ERDs 2020-11-02 09:41:46 +00:00
Knut Sveidqvist
6652319283 Merge branch 'release/8.8.3' into develop 2020-11-01 11:09:40 +01:00
Knut Sveidqvist
855dec7fcd Fix for build 2020-11-01 11:08:47 +01:00
Knut Sveidqvist
e57120fa61 Version update in package.json to 8.8.3 2020-10-31 11:14:39 +01:00
Knut Sveidqvist
f955eef31e Merge branch 'spopida-bug/1710_underscore_in_entity_names' into develop 2020-10-31 11:10:53 +01:00
Knut Sveidqvist
6aaec3dc96 Merge branch 'bug/1710_underscore_in_entity_names' of https://github.com/spopida/mermaid into spopida-bug/1710_underscore_in_entity_names 2020-10-31 11:10:24 +01:00
Knut Sveidqvist
f59e5128d7 Merge pull request #1749 from levlas/bug/1748-broken-links
fix broken links in README
2020-10-31 11:06:54 +01:00
Knut Sveidqvist
29fa2dfcfb Merge pull request #1743 from lishid/patch-1
Fixed bad tertiary operator
2020-10-31 11:05:50 +01:00