1748 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Knut Sveidqvist	a85bb0d86f	Merge pull request #1086 from chris579/bug/1085_coveralls_build_fix ... Bug/1085 Coveralls not working for GitHub builds	2019-11-21 20:58:49 +01: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	ad2802d8e8	Merge pull request #1084 from mermaid-js/bug/1078_handling_of_arrowMarkerAbsolute ... Bug/1078 handling of arrow marker absolute	2019-11-20 21:50:50 +01:00
Christian Klemm	3fedd452a5	added parallel build support	2019-11-20 21:18:19 +01:00
Christian Klemm	292bc3c4e5	Switched to coveralls action	2019-11-20 21:11:48 +01:00
Knut Sveidqvist	512ba8e733	Merge pull request #1077 from mermaid-js/bug/1076_remove_jest_packages ... Bug/1076 Remove jest packages	2019-11-20 19:42:55 +01:00
Knut Sveidqvist	9a87ff684d	Removed logging	2019-11-20 19:33:42 +01:00
Knut Sveidqvist	f79fc21bfc	Merge branch 'develop' into bug/1078_handling_of_arrowMarkerAbsolute	2019-11-20 19:22:10 +01:00
Knut Sveidqvist	ffddd58b6b	Merge branch 'develop' of github.com:knsv/mermaid into develop	2019-11-20 19:21:34 +01:00
Knut Sveidqvist	087e5eaa32	#1055 Fix for tests	2019-11-20 19:21:19 +01:00
Knut Sveidqvist	cbd27831df	#1078 Lint fixes	2019-11-20 19:14:32 +01:00
Knut Sveidqvist	f6028b63b6	#1078 Using the configuration of the arrowMarkerAbsolute	2019-11-20 19:06:46 +01:00
Justin Greywolf	a60e01db97	Corrected typo in test	2019-11-19 13:02:08 -08: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
Justin Greywolf	3469cfca2f	Merge pull request #2 from mermaid-js/develop ... Develop	2019-11-19 12:49:39 -08:00
Christian Klemm	afd189d24c	removed packages	2019-11-19 21:02:56 +01:00
Knut Sveidqvist	06cb09c267	Merge pull request #1049 from mermaid-js/feature/1048_build_workflows ... Feature/1048 Build workflows	2019-11-19 19:45:27 +01:00
Nacho	e461b57a48	Merge pull request #1075 from jbednar/master ... Fixed typos	2019-11-19 08:33:22 -05:00
James A. Bednar	eca9d49575	Fixed typos	2019-11-18 09:32:39 -06:00
Nacho	15a37a5062	Merge pull request #1070 from GDFaber/develop ... Bug/1062 Parallelogram shaped nodes are not in documentation	2019-11-18 08:41:24 -05:00
Christian Klemm	3f8f9eb92c	remove debugging	2019-11-17 22:20:53 +01:00
Christian Klemm	33de2bda9e	cypress cache folder fix	2019-11-17 22:13:02 +01:00
Christian Klemm	94d913fbab	debug	2019-11-17 22:04:50 +01:00
Christian Klemm	beb1fcc176	debug	2019-11-17 21:58:53 +01:00
Christian Klemm	1e1a6e3a2d	debug	2019-11-17 21:54:15 +01:00
Christian Klemm	6e7c21e439	debug	2019-11-17 21:47:05 +01:00
Christian Klemm	cfe9aaf639	adjusts	2019-11-17 21:41:55 +01:00
Christian Klemm	69e701befb	adjusts	2019-11-17 21:27:30 +01:00
Christian Klemm	5174a085b7	test path pattern adjust	2019-11-17 21:21:25 +01:00
Christian Klemm	15fab69eca	cache adjusts	2019-11-17 21:03:08 +01:00
Christian Klemm	20b103a0fb	cache adjusts	2019-11-17 21:00:55 +01:00
Christian Klemm	8ebe7ee81a	cache adjusts	2019-11-17 20:57:55 +01:00
Marc Faber	1d747f664b	#1062 added parallelogram nodes to documentation	2019-11-17 17:37:30 +01:00
GDFaber	dbf5988c28	Merge pull request #2 from mermaid-js/develop ... sync fork	2019-11-17 17:14:49 +01:00
Christian Klemm	31ab0e4b7d	Clear cache	2019-11-12 22:15:49 +01:00
Christian Klemm	35ea7083bb	fix cypress cache	2019-11-12 22:12:53 +01:00
Christian Klemm	bf90e8bf44	switched caching method	2019-11-12 22:10:16 +01:00
Christian Klemm	b1305644f4	fixed cypress cache folder	2019-11-12 22:04:47 +01:00
Christian Klemm	34707a057b	temp delete cache	2019-11-12 21:58:05 +01:00
Christian Klemm	f5e90252f1	force reinstalling packages	2019-11-12 21:52:50 +01:00
Christian Klemm	e75acf69aa	Adjusted cache location	2019-11-12 21:43:11 +01:00
Christian Klemm	3ad3fc2622	Cache adjusts	2019-11-12 21:24:35 +01:00
Christian Klemm	a59468d6c1	Caching adjusts	2019-11-12 21:20:05 +01:00
Christian Klemm	86e63b1614	Add caching	2019-11-12 21:14:42 +01: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
Erik Ellingsen	8b5f8b0cb4	grammar	2019-11-08 10:36:41 +01:00
Erik Ellingsen	d0c9b5e98f	grammar	2019-11-08 10:35:38 +01:00