2047 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Knut Sveidqvist	89c1853977	#1261 Removed calls to console.log	2020-02-21 09:50:04 +01:00
Knut Sveidqvist	3acff54837	Merge pull request #1260 from mermaid-js/chris579-patch-1 ... Build action fix	2020-02-17 17:13:25 +01:00
Christian Klemm	c7466f7a1a	adj	2020-02-16 19:54:29 +01:00
Christian Klemm	6420ad9f69	Merge remote-tracking branch 'origin/chris579-patch-1' into chris579-patch-1	2020-02-16 19:47:55 +01:00
Christian Klemm	b30823d5ac	mermaid upgrade	2020-02-16 19:47:14 +01:00
Christian Klemm	864472d648	Update build.yml	2020-02-16 19:41:52 +01:00
Christian Klemm	36b02ec008	adj	2020-02-16 19:32:10 +01:00
Knut Sveidqvist	aad080aa1b	Merge pull request #1259 from mermaid-js/bug/1257_autonumbering ... #1257 Adding the autonumber keyword + tests and docs	2020-02-16 17:13:59 +01:00
Christian Klemm	7b7a6e10f8	adj	2020-02-16 17:11:13 +01:00
Christian Klemm	aeccf92375	Update build.yml	2020-02-16 16:52:15 +01:00
Christian Klemm	f90d271739	Update build.yml	2020-02-16 16:40:43 +01:00
Christian Klemm	9c2fde940d	Update build.yml	2020-02-16 16:35:59 +01:00
Christian Klemm	2b57cc6be8	Update build.yml	2020-02-16 16:31:37 +01:00
Christian Klemm	b62819e3fb	Update build.yml	2020-02-16 16:26:29 +01:00
Christian Klemm	3eb5f2c65b	Update build.yml	2020-02-16 16:10:47 +01:00
Christian Klemm	41be7f951c	Update build.yml	2020-02-16 16:04:20 +01:00
Christian Klemm	7812fdb6ed	Merge pull request #1258 from mermaid-js/actions-fix ... Actions fix	2020-02-16 15:54:55 +01:00
Christian Klemm	4eeb2a0583	lockfile update	2020-02-16 15:46:45 +01:00
Knut Sveidqvist	3dd0c537ee	Font update for e2e tests	2020-02-16 15:39:52 +01:00
Christian Klemm	e0aa42f695	Update package.json	2020-02-16 15:39:20 +01:00
Christian Klemm	5dddf2f757	Update build.yml	2020-02-16 15:38:52 +01:00
Knut Sveidqvist	f8137ea7c1	#1257 Adding the autonumber keyword + tests and docs	2020-02-16 15:26:08 +01:00
Knut Sveidqvist	cf6f1a083e	Upgarding version in docs	2020-02-16 14:19:27 +01:00
Knut Sveidqvist	f9cfeacc67	Version bump	2020-02-16 13:56:37 +01:00
Knut Sveidqvist	98229a47b2	Renabling build for node 10 untagged-7651dabb407ecd5631ce	2020-02-16 12:46:23 +01:00
Knut Sveidqvist	530ace1507	Disabling e2e tests in github actions	2020-02-16 12:39:05 +01:00
Knut Sveidqvist	792c657ff2	Modified build.yml	2020-02-16 09:42:57 +01:00
Knut Sveidqvist	5aa07439a8	Modified build.yml	2020-02-16 09:40:35 +01:00
Knut Sveidqvist	bf2862f164	Updated packages	2020-02-16 09:30:08 +01:00
Knut Sveidqvist	d9ef227435	Updated packages, trying to fix e2e tests in build	2020-02-16 09:17:17 +01:00
Knut Sveidqvist	324c845dc4	Disabling Static tests action due to issues with cypress	2020-02-16 09:06:05 +01:00
Knut Sveidqvist	5d0c44e84b	Adding @babel/preset-env inorder to help build action	2020-02-16 08:54:17 +01:00
GDFaber	01a71c3dbb	Merge pull request #1254 from xbojch/patch-1 ... Typos	2020-02-15 23:54:05 +01:00
Bojan Bedrac	b018f026e3	Typo ... - fixes a typo	2020-02-13 15:51:00 +01:00
Knut Sveidqvist	0a38e3557d	Merge pull request #1248 from DCsunset/bug/1247_ssr_error ... Bug/1247 Fix "window is not defined" with ssr	2020-02-11 07:02:50 +01:00
DCsunset	6f450272b8	#1247 fix "window is not defined" with ssr	2020-02-06 20:26:09 -08:00
Knut Sveidqvist	7e01f9be6e	Merge pull request #1245 from mermaid-js/feature/1224_styling_of_subgraphs ... Feature/1224 styling of subgraphs	2020-02-05 20:06:22 +01:00
Knut Sveidqvist	00d2a1fe9f	Merge branch 'develop' of github.com:mermaid-js/mermaid into develop	2020-02-05 19:42:13 +01:00
Knut Sveidqvist	18d0d435c6	Merge pull request #1241 from jgreywolf/1240-ClassDiagramRefactor ... 1240 class diagram refactor	2020-02-05 19:42:01 +01:00
Knut Sveidqvist	f298c154e2	Merge branch 'develop' of github.com:mermaid-js/mermaid into develop	2020-02-05 19:40:18 +01:00
Knut Sveidqvist	822df37f8c	#1224 Possibility to style text color of nodes and subgraphs as well as apply classes to subgraphs	2020-02-05 19:39:50 +01:00
Knut Sveidqvist	73cac95255	Merge pull request #1238 from GDFaber/feature/962_flowchart_line_label_color_from_linkstyle ... Set text color for flowchart link labels according to linkStyle definitions	2020-02-05 19:36:12 +01:00
Marc Faber	a0e7789d50	#962 added color setting for default link style	2020-02-04 22:07:10 +01:00
Justin Greywolf	c825b37cc6	1240-refactor for class renderer ... prep for future functionality work	2020-02-03 16:04:59 -08:00
Marc Faber	2dd4aa31e5	#962 moved "style from array" function to utils.js, added unit test	2020-02-04 00:24:50 +01:00
Marc Faber	c95adfaf74	#962 Set text color for flowchart link labels according to linkStyle definitions	2020-02-02 22:59:59 +01:00
Justin Greywolf	9da8ea5967	Merge pull request #16 from mermaid-js/develop ... Merge from parent	2020-01-30 10:20:14 -08:00
Knut Sveidqvist	4d5ecc5518	Merge pull request #1203 from jgreywolf/1179-SupportGenericTypesForMembers ... 1179 support generic types for members	2020-01-29 21:08:41 +01:00
Knut Sveidqvist	963a0fcd77	Merge branch 'develop' into 1179-SupportGenericTypesForMembers	2020-01-29 21:08:31 +01:00
Ashish Jain	fbd8dfa5be	Merge pull request #1230 from mermaid-js/bug/1223_multiple_transitions_in_statediagram ... Bug/1223 multiple transitions in statediagram	2020-01-29 21:02:14 +01:00