5663 Commits

Author SHA1 Message Date
Emerson Bottero
9901a73a2a Merge branch 'develop' of https://github.com/emersonbottero/mermaid into develop 2022-10-03 14:01:05 -03:00
Emerson Bottero
40a319fc5b Fix postbuild script 2022-10-03 12:11:00 -03:00
Emerson Bottero
6191bb5f1b
Merge branch 'develop' into develop 2022-09-28 22:47:48 -03:00
Emerson Bottero
d858cd677e chore: update yarn.lock 2022-09-28 22:16:01 -03:00
Emerson Bottero
2376d38e0e docs: improved search 2022-09-28 21:46:07 -03:00
Knut Sveidqvist
80c68d847c
Merge pull request #3524 from ashleybartlett/feature/3078-support-dashes-in-participant-names
[sequenceDiagrams] Support dashes in participant names
2022-09-28 13:40:17 +02:00
Knut Sveidqvist
fed00be430
Merge pull request #3516 from weedySeaDragon/feature/3171--erDiagram-allow-chars-in-entity-name
feat: ER diagram: allow other chars in a quoted entity name
2022-09-28 13:29:54 +02:00
Knut Sveidqvist
ef527cb0fa
Merge branch 'develop' into feature/3171--erDiagram-allow-chars-in-entity-name 2022-09-28 13:24:54 +02:00
Knut Sveidqvist
e1c63139b2
Merge pull request #3512 from weedySeaDragon/bug/3429_er-dark-theme-attribute-colors
fix: ER dark theme attribute colors
2022-09-28 13:18:11 +02:00
Knut Sveidqvist
edb30c9feb
Merge branch 'develop' into bug/3429_er-dark-theme-attribute-colors 2022-09-28 13:17:00 +02:00
Knut Sveidqvist
66809ed972
Merge pull request #3513 from IanLee1521/patch-1
Mention obsidian has native support for mermaid
2022-09-28 13:12:54 +02:00
Knut Sveidqvist
c66d5cb890
Merge pull request #3523 from weedySeaDragon/chore/2904_fix-demo-charts-add-accTags
chore: fix demo chart pages
2022-09-28 13:12:15 +02:00
Knut Sveidqvist
fe8df78322 Clarification in the docs regarding directions in the subgraps for flowcharts. 2022-09-28 12:32:58 +02:00
Ashley Bartlett
7da6c0e867 Fix testing bug 2022-09-27 14:25:19 +10:00
Ashley Bartlett
0a0b6d51ba Add support for hyphens in participant names 2022-09-27 14:24:54 +10:00
Ashley Engelund (weedySeaDragon @ github)
7ed3c21a6d move charts to their pages; index page just a list to them 2022-09-26 18:16:36 -07:00
Ashley Engelund (weedySeaDragon @ github)
3d0214d453 new page for pie charts 2022-09-26 18:16:00 -07:00
Ashley Engelund (weedySeaDragon @ github)
d0e9de2744 new page for context charts 2022-09-26 18:15:29 -07:00
Ashley Engelund (weedySeaDragon @ github)
99264fab8a new page for git charts 2022-09-26 18:15:13 -07:00
Ashley Engelund (weedySeaDragon @ github)
d4519bb730 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 17:32:15 -07:00
Ashley Engelund (weedySeaDragon @ github)
6468c8e857 Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-26 17:31:56 -07:00
dependabot[bot]
503cbedc96
chore(deps-dev): bump @types/prettier from 2.7.0 to 2.7.1 (#3520)
Bumps [@types/prettier](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/prettier) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/prettier)

---
updated-dependencies:
- dependency-name: "@types/prettier"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-26 13:28:16 +02:00
dependabot[bot]
a448409750
chore(deps-dev): bump eslint from 8.23.1 to 8.24.0 (#3521)
Bumps [eslint](https://github.com/eslint/eslint) from 8.23.1 to 8.24.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.23.1...v8.24.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-26 13:27:42 +02:00
weedySeaDragon
b3ca701b8d chore: update browsers list 2022-09-26 07:15:56 +00:00
mmorel-35
62e127f1b8 chore: update browsers list 2022-09-26 07:15:07 +00:00
Sidharth Vinod
696164c9a6
Merge pull request #3519 from aloisklink/ci/fix-e2e-when-running-from-fork
ci(e2e): fix e2e action when running from fork
2022-09-26 07:57:11 +05:30
Alois Klink
56e1411d37 ci(e2e): fix e2e action when running from fork
PRs from forks don't have acess to the secrets.CYPRESS_RECORD_KEY.
Because of this, we need to disable `recording`.
2022-09-25 20:11:42 +01:00
Emerson Bottero
d8ee2bb850 docs: no footer 2022-09-25 11:53:08 -03:00
Emerson Bottero
609d28c6ee docs: added edit and team page 2022-09-25 11:22:34 -03:00
Emerson Bottero
eeafa8f5aa docs: added the fixed search again 2022-09-24 23:24:48 -03:00
Ashley Engelund (weedySeaDragon @ github)
ddc35fa9ce a few more wee changes to the ER demo 2022-09-24 16:50:02 -07:00
Ashley Engelund (weedySeaDragon @ github)
908f5afe0f Merge remote-tracking branch 'MERMAID/develop' into develop 2022-09-24 16:16:29 -07:00
Ashley Engelund (weedySeaDragon @ github)
5daa130857 er demo: clarify comment about name 2022-09-24 16:11:07 -07:00
Ashley Engelund (weedySeaDragon @ github)
c202b94a9a yarn install after merge with upstream/develop 2022-09-24 16:10:34 -07:00
Ashley Engelund (weedySeaDragon @ github)
ed0f22b037 Merge remote-tracking branch 'MERMAID/develop' into bug/er/allow-chars-in-entity-name
# Conflicts:
#	vite.config.cts
#	yarn.lock
2022-09-24 16:06:54 -07:00
Ashley Engelund (weedySeaDragon @ github)
eb1c6894f5 change demo ER diagram to include attributes, names with various chars 2022-09-24 16:05:59 -07:00
Ashley Engelund (weedySeaDragon @ github)
91091c614f store and reference entity by unique id, not name (elements, graph, etc.) 2022-09-24 16:05:20 -07:00
Ashley Engelund (weedySeaDragon @ github)
481b5cde0f (minor) fix ==; remove unused imports; fix typos; add comments 2022-09-24 16:02:55 -07:00
Ashley Engelund (weedySeaDragon @ github)
d328879329 add uuid; graph node ids can no longer be based on entity names; make unique id 2022-09-24 15:40:02 -07:00
Ashley Engelund (weedySeaDragon @ github)
3c1bad1792 er jison: allow more chars in Entity name; clean up spec 2022-09-24 15:38:06 -07:00
Emerson Bottero
5e4bcbdfa0 chore: fix Original Setup 2022-09-23 23:51:33 -03:00
Emerson Bottero
87911f4a56 docs: build working 2022-09-23 23:33:24 -03:00
Ashley Engelund (weedySeaDragon @ github)
9ec935f109 add ts-ignore for jison in vite.config.cts 2022-09-23 11:35:31 -07:00
Ashley Engelund (weedySeaDragon @ github)
4bedc49b4d define ENTITY_NAME that allows some non-alphanumeric chars; spec re-arrange 2022-09-23 11:34:52 -07:00
Knut Sveidqvist
1a46582e1e
Merge pull request #3503 from mermaid-js/sidv/viteVitest
Build mermaid using Vite
2022-09-23 14:04:39 +02:00
Sidharth Vinod
1e71798467
fix: Core build 2022-09-23 17:20:40 +05:30
Sidharth Vinod
8c63d002e7
fix: js-base64
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 16:53:11 +05:30
Sidharth Vinod
67b1e8dbe9
fix OutputOptions type 2022-09-23 16:00:27 +05:30
Sidharth Vinod
bc0be28f08
fix: js-base64
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:54:24 +05:30
Sidharth Vinod
eaa1602b1a
fix: json import, js-base64
Co-authored-by: Alois Klink <alois@aloisklink.com>
2022-09-23 15:42:41 +05:30