2619 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
chris moran	17478491e9	Merge branch 'mermaid-js-develop' into develop	2020-07-22 16:33:46 -04:00
Knut Sveidqvist	245cf6d2e0	Merge pull request #1567 from mermaid-js/feature/Issue-1465_Class_migration ... Feature/issue 1465 class migration	2020-07-22 21:35:01 +02:00
Ashish Jain	71af9741cc	Correct positioning for class title	2020-07-22 21:25:01 +02:00
chris moran	0503b64205	Merge branch 'mermaid-js-develop' into develop	2020-07-22 14:55:02 -04:00
Ashish Jain	c9d4cac3ff	Merge branch 'develop' into feature/Issue-1465_Class_migration	2020-07-22 19:33:20 +02:00
Ashish Jain	a2932a0393	Merge branch 'master' into develop	2020-07-22 19:30:55 +02:00
Ashish Jain	6917303e1b	Enabled styles.js for classDiagram-v2	2020-07-22 19:25:26 +02:00
Knut Sveidqvist	f685363574	Relase 8.6.2 8.6.2	2020-07-22 19:22:02 +02:00
Ashish Jain	03c19ccae9	Migrated style css from scss file to styles.js	2020-07-22 19:10:28 +02:00
Knut Sveidqvist	7313b4b649	Merge pull request #1566 from mermaid-js/1552_fix_broken_cardinality_class_diagram ... #1552 Fix for broken cardinality support for class diagrams	2020-07-22 19:07:25 +02:00
Ashish Jain	ff439369da	Updated variable name to cnf	2020-07-22 18:27:25 +02:00
Ashish Jain	24e470a099	Merge branch 'develop' into feature/Issue-1465_Class_migration	2020-07-22 18:23:47 +02:00
Ashish Jain	8e72ddde32	#1552 Update current.html for cardinality test	2020-07-22 18:20:31 +02:00
Ashish Jain	07a7ea1f23	#1552 Fix for broken cardinality support for class diagrams	2020-07-22 17:35:01 +02:00
Ashish Jain	516649a508	Adjusting initial classDiagram shape rendering	2020-07-21 15:27:02 +02:00
Ashish Jain	abe23250c4	Adjusting initial classDiagram shape rendering	2020-07-21 15:25:16 +02:00
Knut Sveidqvist	0f575907c7	Merge pull request #1560 from NeilCuzon/release/8.6.0 ... Edited Release/8.6.0	2020-07-21 12:56:38 +02:00
Knut Sveidqvist	835a3f6149	Merge pull request #1563 from mermaid-js/bug/1562_arrowheads_in_edges_to_cluster ... Bug/1562 arrowheads in edges to cluster	2020-07-21 12:55:40 +02:00
Knut Sveidqvist	b93ef22687	#1562 Fix for test	2020-07-21 12:31:05 +02:00
Knut Sveidqvist	bfd927d395	Merge pull request #1561 from mermaid-js/bug/1532_edge_issue ... #Beta flowchart: issues with edges to some types of nodes	2020-07-21 12:12:06 +02:00
Knut Sveidqvist	cb79302867	#1562 Updated handling of pointsarray when the point is already in the array	2020-07-21 12:01:08 +02:00
Knut Sveidqvist	211d6f4005		2020-07-21 11:15:42 +02:00
Neil Cuzon	ddee6d2b6a	Update config.js	2020-07-20 20:07:57 -07:00
Neil Cuzon	575c34467f	Merge branch 'develop' into release/8.6.0	2020-07-20 20:01:32 -07:00
Neil Cuzon	dc8c27b1f9	Update faq.md	2020-07-20 12:09:49 -07:00
Neil Cuzon	4639ec87d2	Update faq.md	2020-07-20 12:09:38 -07:00
Neil Cuzon	50079670f9	Update user-journey.md	2020-07-20 12:09:02 -07:00
Neil Cuzon	ae12e65712	Update usage.md	2020-07-20 12:00:45 -07:00
Neil Cuzon	2f9be335cb	Update n00b-syntaxReference.md	2020-07-20 11:58:36 -07:00
Neil Cuzon	9e59d927f2	Update n00b-overview.md	2020-07-20 11:51:23 -07:00
Neil Cuzon	ced3e5fec8	Update n00b-overview.md	2020-07-20 11:48:15 -07:00
Neil Cuzon	50eb523d8e	Update n00b-syntaxReference.md	2020-07-20 11:45:13 -07:00
Neil Cuzon	d6baf1b32a	Update n00b-syntaxReference.md	2020-07-20 11:39:59 -07:00
Neil Cuzon	60b8dfaa2d	Update n00b-syntaxReference.md	2020-07-20 11:39:39 -07:00
Neil Cuzon	815f398ada	Update n00b-syntaxReference.md	2020-07-20 11:39:23 -07:00
Neil Cuzon	56ed31ed6f	Update n00b-syntaxReference.md	2020-07-20 11:34:05 -07:00
Neil Cuzon	3213fbff8b	Update breakingChanges.md	2020-07-20 09:35:46 -07:00
Neil Cuzon	4bca9c63da	Update classDiagram.md	2020-07-20 09:35:12 -07:00
Neil Cuzon	01fe70a29a	Update development.md	2020-07-20 09:34:37 -07:00
Neil Cuzon	e43804d950	Update README.md	2020-07-20 09:31:51 -07:00
Neil Cuzon	17206fc538	Update CHANGELOG.md	2020-07-20 09:31:01 -07:00
Neil Cuzon	8cda6ede84	Update 8.6.0_docs.md	2020-07-20 09:30:05 -07:00
Knut Sveidqvist	a6ec038189	Merge pull request #1558 from mermaid-js/less_theme_variables ... More theming tweaks	2020-07-20 17:37:18 +02:00
Knut Sveidqvist	ffaf6c14e4	#154 trweaking some more, state diagram composit backgrounds	2020-07-20 17:10:59 +02:00
Knut Sveidqvist	3a6915c0b6	#154 lint fixes	2020-07-20 15:24:12 +02:00
Knut Sveidqvist	93a8c83a68	#1542 Alignment between themes	2020-07-20 15:15:03 +02:00
Knut Sveidqvist	1302addcdd	#1542 Base theme for simple custom themeing	2020-07-20 14:13:05 +02:00
Knut Sveidqvist	490cbd3f0d	Merge pull request #1557 from cmmoran/develop ... Render tweak - each diagram should reset the config to siteConfig upon rendering	2020-07-20 11:01:29 +02:00
Knut Sveidqvist	631355d788	Merge pull request #1556 from mermaid-js/less_theme_variables ... Tweaks of the new styling engine and tweaks of theams using is	2020-07-20 11:00:45 +02:00
chris moran	ec1ab05ae6	Deprecated prepush script in package.json -> ... This fixes: ```Warning: Setting pre-push script in package.json > scripts will be deprecated Please move it to husky.hooks in package.json, a .huskyrc file, or a husky.config.js file Or run ./node_modules/.bin/husky-upgrade for automatic update```	2020-07-20 04:49:43 -04:00