Commit graph

3693 commits

Author SHA1 Message Date
Knut Sveidqvist
fa6f453e88 Merge branch 'master' into release/8.11.2 2021-07-29 19:33:17 +02:00
Knut Sveidqvist
4c00e90436
Merge pull request #2210 from mermaid-js/2209_safety
Combining Mermaids native sanitation with DOMPurify
2021-07-29 18:25:42 +02:00
Knut Sveidqvist
7d802a71c1 Fix for tests 2021-07-29 18:11:48 +02:00
Knut Sveidqvist
69a1bb99ac #2209 Combining sanitasion approaches 2021-07-29 18:05:13 +02:00
Knut Sveidqvist
d523818339 Merge branch 'release/8.11.1' 2021-07-28 15:59:33 +02:00
Knut Sveidqvist
33e8ee6c0e Release 8.11.1 2021-07-28 15:54:24 +02:00
Knut Sveidqvist
a87d557354 Updating version 2021-07-28 11:20:09 +02:00
Knut Sveidqvist
024f7c3275 Hardcoding preview version 2021-07-28 10:20:14 +02:00
Knut Sveidqvist
f2910da513 Test commit 2021-07-28 10:14:50 +02:00
Knut Sveidqvist
b5ed5db880 Moving dom purify from devDependencies to dependencies 2021-07-28 09:57:09 +02:00
Knut Sveidqvist
fa65e73bd0 Updated node version for preview publishing 2021-07-28 09:30:55 +02:00
Knut Sveidqvist
52b1b23d47
Merge pull request #2164 from mermaid-js/dependabot/github_actions/develop/actions/setup-node-2.2.0
Bump actions/setup-node from 1 to 2.2.0
2021-07-15 14:54:54 +02:00
Knut Sveidqvist
030d383d30
Merge pull request #2184 from anishkny/patch-1
docs(README): Point to live editor
2021-07-15 14:53:49 +02:00
Knut Sveidqvist
b34f7bcdd5
Merge pull request #2187 from mermaid-js/2177_dependency_updates
2177 dependency updates
2021-07-15 14:27:07 +02:00
Knut Sveidqvist
6a3991bbaa
Merge branch 'develop' into 2177_dependency_updates 2021-07-15 14:26:31 +02:00
Knut Sveidqvist
5d2a9fe267 Updated documentation 2021-07-15 13:44:06 +02:00
Knut Sveidqvist
cd8620cc9d Node switch for e2e builds 2021-07-15 12:27:21 +02:00
Knut Sveidqvist
5399214ad8 Update of prettier, eslint and rules 2021-07-15 11:35:12 +02:00
Knut Sveidqvist
896c7eca57 Fix for issue with updated stylis 2021-07-15 10:58:22 +02:00
Knut Sveidqvist
c29486f515 Switching node version to version 16 2021-07-15 10:22:33 +02:00
Knut Sveidqvist
3fe1f5af60 Switchiung node version 2021-07-15 10:19:55 +02:00
Knut Sveidqvist
1034e1a301 #2177 Jets upgrade 2021-07-15 10:14:35 +02:00
Anish Karandikar
6379320b83
docs(README): Point to live editor
Perhaps it makes more sense to point directly to the live editor where a user can start playing around, instead of the repo for the live editor (which is still reachable from the editor itself).
2021-07-11 10:45:48 -07:00
Knut Sveidqvist
30de90e4f0 #2177 Updating sanitize-url, dagre, graphlib, khroma, moment-mini, stylis 2021-07-07 18:06:09 +02:00
Neil Cuzon
52a40112a2
Merge pull request #2178 from sidharthv96/updateTutorial
Update Tutorials for LiveEditor V2
2021-07-07 08:17:29 -07:00
Knut Sveidqvist
7a679dea2d #2177 Updating babel 2021-07-07 17:09:08 +02:00
Knut Sveidqvist
0eb86cb97f #2177 Updating start-server-and-test , webpack-bundle-analyzer and removing yarn-upgrade-all 2021-07-07 17:04:14 +02:00
Knut Sveidqvist
7fcb1ae9b3 #2177 Updating cypress and percy 2021-07-07 16:41:36 +02:00
Knut Sveidqvist
6715498598 #2177 Updating cypress and percy 2021-07-07 16:41:22 +02:00
Knut Sveidqvist
eaec4c9744
Merge pull request #2145 from carbeer/patch-1
Fix broken internal links in README
2021-07-07 14:05:56 +02:00
Knut Sveidqvist
fa07abd014
Merge pull request #2175 from sidharthv96/fix/entity-decode
Remove entity-decode dependency
2021-07-07 14:01:37 +02:00
Knut Sveidqvist
30a02adfe3
Merge branch 'develop' into fix/entity-decode 2021-07-07 14:01:30 +02:00
Knut Sveidqvist
ea6102e123
Merge pull request #2171 from mermaid-js/2170_dompurify
2170 dompurify
2021-07-07 13:51:14 +02:00
Sidharth Vinod
b5aaf0f990
Update Tutorails for LiveEditor V2 2021-07-07 02:11:06 +05:30
Sidharth Vinod
ed6abb6d92
Merge branch 'develop' of github.com:sidharthv96/mermaid into fix/entity-decode
* 'develop' of github.com:sidharthv96/mermaid:
  Update flowchart.md
  Added new theme user journey diagram specific theme variables
  fix typo
  2122 Blöockling javascript urls
  fix: Assign proper namespaces to foreignObject children
  Small positoining fix for parallell processes and nested composite states
  Version update in the docs
  Updated version in package.json and recompile
  Lint fix
  fix typo
  Fix for styling
  Fox fr keeping the label background in state diagrams
  Removed  unused dependency "he"
  Ensuring "minify" is only listed as a dev dependency
  Update n00b-syntaxReference.md
  Update _sidebar.md
  [docs] Update default log level value
2021-07-07 02:02:42 +05:30
Sidharth Vinod
862330a576
Fix #1603 Remove entity-decode Dependency. 2021-07-07 02:00:44 +05:30
Knut Sveidqvist
fadda49b0e More fixes with the dependencies 2021-07-05 12:46:11 +02:00
Knut Sveidqvist
db5709a033 Adding js-base64 2021-07-05 12:31:32 +02:00
Knut Sveidqvist
c447262764 Testcommit 2021-07-05 12:05:33 +02:00
Knut Sveidqvist
79e6013342 Adding dompurify 2021-07-05 11:56:06 +02:00
Knut Sveidqvist
2c00d4c116 Adding dompurify 2021-07-05 11:45:11 +02:00
Knut Sveidqvist
b468065c6b Adding dompurify 2021-07-05 11:38:24 +02:00
Knut Sveidqvist
67050e4d6d #2170 Adjusting tests 2021-07-05 11:10:26 +02:00
Knut Sveidqvist
5437ab7057 #2170 Lint fix 2021-07-05 10:27:15 +02:00
Knut Sveidqvist
2f73fd3a9d #2170 Adding dompurify 2021-07-05 10:21:11 +02:00
dependabot[bot]
27b6845b78
Bump actions/setup-node from 1 to 2.2.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 1 to 2.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v1...v2.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-30 20:08:14 +00:00
Knut Sveidqvist
1310619848 Merge branch 'master' into develop 2021-06-27 08:34:17 +02:00
Knut Sveidqvist
1d78267871 Merge branch 'release/8.11.0' 2021-06-27 07:57:35 +02:00
Knut Sveidqvist
ed0947d761 Updated test 2021-06-27 00:57:28 +02:00
Knut Sveidqvist
6564bad85e Updated test 2021-06-27 00:40:14 +02:00