mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,426 Commits 167 Branches 138 Tags 350 MiB
Commit Graph

1426 Commits

Author SHA1 Message Date
knsv b9ad9ba674 #884 Merging configuration updates to previous condifguration. 2019-07-21 02:09:22 -07:00
Knut Sveidqvist 92ac7d7c24 Fixing labels in the new docsify documentation so that they does not get cut 2019-07-17 18:14:22 +02:00
knsv 8e27318eda #847 fix for case texts with multiple br tags, explanation in usage doc on how to avoid labels out of bounds. 2019-07-16 16:05:22 -07:00
knsv 976d16b0db Updated docs with working code examples 2019-07-16 12:13:40 -07:00
ashishjain0512 1cee9828b0 Added script for update e2e snapshots 2019-07-16 08:32:27 -07:00
Ashish Jain 2c7f00bac1 Merge branch 'master' into feature/allow-class-directly-at-node-flow 2019-07-15 12:37:18 +02:00
Knut Sveidqvist 484b24d097
Merge pull request #882 from IOrlandoni/fix/whitespace-in-participant 
Trimming whitespace after participant id
 2019-07-14 10:36:10 -07:00
IOrlandoni e93cc85e9b Trimming whitespace after participant id 2019-07-14 11:51:20 -04:00
Knut Sveidqvist 615381f8e7
Merge pull request #879 from knsv/dependabot/npm_and_yarn/js-yaml-3.13.1 
chore(deps): bump js-yaml from 3.12.0 to 3.13.1
 2019-07-14 08:48:59 -07:00
Knut Sveidqvist b01f7e1d54
Merge pull request #880 from knsv/dependabot/npm_and_yarn/fstream-1.0.12 
chore(deps): bump fstream from 1.0.11 to 1.0.12
 2019-07-14 08:48:15 -07:00
Knut Sveidqvist f29e1e2ee0
Merge pull request #881 from knsv/dependabot/npm_and_yarn/atob-2.1.2 
chore(deps): bump atob from 2.0.3 to 2.1.2
 2019-07-14 08:47:56 -07:00
dependabot[bot] ec4be237b5
chore(deps): bump atob from 2.0.3 to 2.1.2 
Bumps [atob](https://github.com/coolaj86/node-browser-compat) from 2.0.3 to 2.1.2.
- [Release notes](https://github.com/coolaj86/node-browser-compat/releases)
- [Commits](https://github.com/coolaj86/node-browser-compat/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-14 13:50:12 +00:00
dependabot[bot] 6249c90bc9
chore(deps): bump fstream from 1.0.11 to 1.0.12 
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12.
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-14 13:50:06 +00:00
dependabot[bot] 69efac3634
chore(deps): bump js-yaml from 3.12.0 to 3.13.1 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-14 13:49:54 +00:00
Knut Sveidqvist 77b68ec12e
Merge pull request #878 from knsv/i847-cross-site-scripting 
I847 cross site scripting
 2019-07-14 06:47:42 -07:00
Knut Sveidqvist c818dbb5a0 Setting default securityLevel to strict, updated docs in mermaidAPI 2019-07-14 06:07:27 -07:00
Knut Sveidqvist 9753578903 Removed filelog as it causes a security warning 2019-07-14 02:44:46 -07:00
Knut Sveidqvist 5abedab095 e2e test for stricter security in mermaid 2019-07-14 02:05:59 -07:00
Knut Sveidqvist 31576f8f55 #847 Removing </> in text 2019-07-13 22:50:53 -07:00
Knut Sveidqvist 31a2b2ca3c
Merge pull request #877 from knsv/dependabot/npm_and_yarn/lodash.mergewith-4.6.2 
Bump lodash.mergewith from 4.6.1 to 4.6.2
 2019-07-13 15:45:26 +02:00
dependabot[bot] 27cc737fe1
Bump lodash.mergewith from 4.6.1 to 4.6.2 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-13 08:00:36 +00:00
Knut Sveidqvist 064700be36
Merge pull request #875 from knsv/dependabot/npm_and_yarn/lodash-4.17.13 
Bump lodash from 4.17.11 to 4.17.13
 2019-07-13 09:58:57 +02:00
Knut Sveidqvist 343277e387
Merge pull request #876 from knsv/docsify 
Adding docs into core repo again
 2019-07-13 09:36:41 +02:00
dependabot[bot] 363b878a24
Bump lodash from 4.17.11 to 4.17.13 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-13 07:04:21 +00:00
Knut Sveidqvist 69c7d31e69 Adding docs into core repo again 2019-07-12 20:40:54 +02:00
Knut Sveidqvist e5bd0e6dc7
Merge pull request #874 from knsv/feature/update-stale-bot-config 
feat(stale.yml): update issue label and bot comment
 2019-07-12 18:07:57 +02:00
Knut Sveidqvist 3b41ba9dd9
Merge pull request #872 from knsv/feature/allow-inclusive-enddates 
Feature/allow inclusive enddates
 2019-07-12 18:05:21 +02:00
Jason Würtz 17b4c98db1 feat(stale.yml): update issue label and bot comment 2019-07-11 19:28:00 -03:00
Ashish Jain 04d55f60ea Test Commit 2019-07-10 17:46:08 +02:00
Knut Sveidqvist 86f430f61b Update issue templates 2019-07-08 07:38:05 +02:00
Jason Würtz c6511ed829 test(ganttDb.spec): add simple tests for the durationToDate fn 2019-07-07 17:17:22 -03:00
Jason Würtz 047760ad4b chore(ganttDb): export durationToDate so it can be tested 2019-07-07 17:17:05 -03:00
Jason Würtz b7c4b66b61 test(ganttDb.spec): fix missing initialization for clear test 2019-07-07 17:04:40 -03:00
Jason Würtz 67bb5ffa73 refactor(ganttDb.js): extract durationToDate function 
codeclimate was complaining about the getEndDate function so I split it up
 2019-07-07 17:01:45 -03:00
Jason Würtz a671576578 feat(index.html): add example to display new behavior 2019-07-07 16:51:40 -03:00
Jason Würtz 1ee4b964e2 test(gantt.spec): add assertions to check that the parser didn't error 2019-07-07 16:41:07 -03:00
Jason Würtz cb7d05bd53 chore(gantt.js): generate parser from jison 2019-07-07 16:28:53 -03:00
Jason Würtz 16f3338b3d feat(gantt.jison): update parser to accept a inclusive end date arg 
if a line contains inclusiveEndDates then it will toggle the chart to use inclusive end dates
 2019-07-07 16:28:31 -03:00
Jason Würtz 0a567a3ef9 test(ganttDb): update inclusive end date tests 2019-07-07 16:27:41 -03:00
Jason Würtz 660e0f3d8b refactor(ganttDb): separate out the inclusive end date toggle 2019-07-07 16:27:28 -03:00
Jason Würtz ee766ec88e fix(ganttDb): change manual end time determination 
now it just checks if a valid end time was provided and instead of the comparison that went on before.
This needed to be done in order to support manual end dates with inclusive set to true since they don't match anymore as the 'manually' supplied end date is increased by one
 2019-07-06 12:28:56 -03:00
Jason Würtz 63096a5c26 feat(ganttDb.js): add 1 day to end dates if inclusive is set to true 
This will essentially keep all old behavior the same while still allowing users to specify if they want inclusive end dates
 2019-07-06 12:27:28 -03:00
Jason Würtz b5b714861d test(ganttDb.spec): flip function design to specify inclusive instead 2019-07-06 12:26:32 -03:00
Jason Würtz 5c2d416a34 test(ganttDB.spec): fix typo 2019-07-06 12:25:57 -03:00
Jason Würtz 0515375cfa test(ganttDb.spec): clear function 2019-07-06 11:54:45 -03:00
Jason Würtz 6d20ccccd0 feat(ganttDb.js): add getters for excludes,sections and date format 2019-07-06 11:54:18 -03:00
Jason Würtz 6dce255393 fix(ganttDb.js): clear formats and excludes on clear 2019-07-06 11:30:13 -03:00
Jason Würtz 402d4bdee1 test(gantt.spec): add parser test for inclusive end dates 2019-07-06 11:29:50 -03:00
Jason Würtz 123fba5b07 test(ganttDb.spec): add test case for inclusive end dates 2019-07-06 11:29:10 -03:00
Knut Sveidqvist f506c795d6 git push origin master Merge branch 'paulbland-sequence-numbers' 2019-06-30 16:15:21 +02:00