Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1252 gitgraph reinvented #2877

Merged
merged 53 commits into from
Mar 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6df9bf3
Work in progress
knsv Oct 15, 2020
5fb572a
Merge branch 'develop' into 1252_gitgraph_reinvented
knsv Oct 22, 2020
6eaea38
Adding styling
knsv Oct 22, 2020
8435e3c
Linting tmp fix
knsv Oct 22, 2020
f67a374
Printing barnches and labels
knsv Oct 22, 2020
3f6296b
#1713, #1719, # 1720
ashishjain0512 Oct 22, 2020
bb2dd2f
getting there
ashishjain0512 Feb 10, 2022
40f95a5
chore: merge branch 'develop' into 1252_gitgraph_reinvented
ashishjain0512 Feb 17, 2022
ffc6cae
fix: adding gitgraph to default config
ashishjain0512 Feb 17, 2022
7098bf9
fix: update mockDB
ashishjain0512 Feb 17, 2022
cc82628
Rendering commits and commit labels
knsv Feb 17, 2022
4753ae8
feature: adding arrows to the git graph
knsv Feb 24, 2022
933efd0
replace mock data with real
ashishjain0512 Feb 24, 2022
14464f9
merge develop to current branch
ashishjain0512 Feb 24, 2022
c0cb05b
Added sample for tag,type and id for a commit
ashishjain0512 Feb 24, 2022
bc9ff49
Clean up gitg=Graph JISON
ashishjain0512 Feb 24, 2022
b110567
Bends of the lines when branching
knsv Mar 3, 2022
1f175d2
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/merm…
knsv Mar 3, 2022
7e041dd
Arrows colored by branch and skip of arrow heads
knsv Mar 3, 2022
56a1c27
added merge commit type
ashishjain0512 Mar 3, 2022
5a8c372
update gitgraph jison
ashishjain0512 Mar 3, 2022
b1fab6f
Theming changes for base theme
knsv Mar 3, 2022
8cb548d
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/merm…
knsv Mar 3, 2022
9ddf138
fix check if branch already exist
ashishjain0512 Mar 10, 2022
4ff3b23
feat: adding highlight and reverse commit types and some pathfinding
knsv Mar 10, 2022
2b3f99d
Draft handling of occupied lanes
knsv Mar 10, 2022
781b239
Lint fixes
knsv Mar 10, 2022
7bd9286
fix checkout if branch already exist
ashishjain0512 Mar 10, 2022
21c97f9
added rendering tests
ashishjain0512 Mar 10, 2022
0a8a079
Renedring fix in an edge case
knsv Mar 17, 2022
9f7130a
Merge branch 'develop' into 1252_gitgraph_reinvented
knsv Mar 17, 2022
243f2b2
fix for gitGraph (:) and spaces (new line) issue
ashishjain0512 Mar 17, 2022
01970d2
fix broken rendering for math error
ashishjain0512 Mar 17, 2022
c1dead1
Added branch, merge and checkout error handling scenarios
ashishjain0512 Mar 17, 2022
1ef58e2
Fixed rendering test cases
ashishjain0512 Mar 17, 2022
501e628
Added gitGraph jest test cases
ashishjain0512 Mar 17, 2022
a7c33b7
Replacing master to main in test cases
ashishjain0512 Mar 17, 2022
b78b371
Added theming support for gitgraph
knsv Mar 17, 2022
4023be1
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/merm…
knsv Mar 17, 2022
a9194d4
Added test cases for error handling
ashishjain0512 Mar 17, 2022
a29e2e6
Merge branch 'develop' into 1252_gitgraph_reinvented
Mar 24, 2022
4eb7d0d
Update the gitgraph example
Mar 24, 2022
b9bde5e
Fixed more example cases
Mar 24, 2022
2ab275b
Merge branch 'develop' into 1252_gitgraph_reinvented
Mar 24, 2022
c0335cf
#1252 Adding support for tags
knsv Mar 24, 2022
3ee141f
Added Gitgraph docs
Mar 24, 2022
22aca7b
#1252 Adding background on commit labels
knsv Mar 25, 2022
f642173
Merge branch 'develop' into 1252_gitgraph_reinvented
knsv Mar 31, 2022
12c63ff
Finalizing GitGraph with directives, theming & docs
ashishjain0512 Mar 31, 2022
bbac11a
Updated rendering test with fixed id
ashishjain0512 Mar 31, 2022
3ccf027
Removing random label for merge commits
knsv Mar 31, 2022
51e9a6b
Added sanitization for gitGraph
ashishjain0512 Mar 31, 2022
57ac111
Added commit types in renderer
ashishjain0512 Mar 31, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .ackrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--ignore-dir=dist
--ignore-file=match:/^yarn\.lock$/
--ignore-file=match:/^yarn-error\.log$/
--ignore-dir=coverage
--ignore-dir=dist
--ignore-file=match:/^yarn\.lock$/
--ignore-file=match:/^yarn-error\.log$/
--ignore-dir=coverage
22 changes: 11 additions & 11 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
root = true

[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
indent_size = 4
root = true
[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
indent_size = 4
24 changes: 12 additions & 12 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# These are supported funding model platforms

github: [knsv]
#patreon: # Replace with a single Patreon username
#open_collective: # Replace with a single Open Collective username
#ko_fi: # Replace with a single Ko-fi username
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
#liberapay: # Replace with a single Liberapay username
#issuehunt: # Replace with a single IssueHunt username
#otechie: # Replace with a single Otechie username
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
# These are supported funding model platforms
github: [knsv]
#patreon: # Replace with a single Patreon username
#open_collective: # Replace with a single Open Collective username
#ko_fi: # Replace with a single Ko-fi username
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
#liberapay: # Replace with a single Liberapay username
#issuehunt: # Replace with a single IssueHunt username
#otechie: # Replace with a single Otechie username
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
40 changes: 20 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'Status: Triage, Type: Enhancement'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'Status: Triage, Type: Enhancement'
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
30 changes: 15 additions & 15 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: Question
about: Get some help from the community.
title: ''
labels: 'Help wanted!, Type: Other'
assignees: ''

---

## Help us help you!
You want an answer. Here are some ways to get it quicker:
* Use a clear and concise title.
* Try to pose a clear and concise question.
* Include as much, or as little, code as necessary.
* Don't be shy to give us some screenshots, if it helps!
---
name: Question
about: Get some help from the community.
title: ''
labels: 'Help wanted!, Type: Other'
assignees: ''
---
## Help us help you!
You want an answer. Here are some ways to get it quicker:
* Use a clear and concise title.
* Try to pose a clear and concise question.
* Include as much, or as little, code as necessary.
* Don't be shy to give us some screenshots, if it helps!
26 changes: 13 additions & 13 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
## :bookmark_tabs: Summary
Brief description about the content of your PR.

Resolves #<your issue id here>

## :straight_ruler: Design Decisions
Describe the way your implementation works or what design decisions you made if applicable.

### :clipboard: Tasks
Make sure you
- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
- [ ] :computer: have added unit/e2e tests (if appropriate)
- [ ] :bookmark: targeted `develop` branch
## :bookmark_tabs: Summary
Brief description about the content of your PR.
Resolves #<your issue id here>
## :straight_ruler: Design Decisions
Describe the way your implementation works or what design decisions you made if applicable.
### :clipboard: Tasks
Make sure you
- [ ] :book: have read the [contribution guidelines](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md)
- [ ] :computer: have added unit/e2e tests (if appropriate)
- [ ] :bookmark: targeted `develop` branch
50 changes: 25 additions & 25 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
name-template: '$NEXT_PATCH_VERSION'
tag-template: '$NEXT_PATCH_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'Type: Enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'Type: Bug / Error'
- title: '🧰 Maintenance'
label: 'Type: Other'
change-template: '- $TITLE (#$NUMBER) @$AUTHOR'
sort-by: title
sort-direction: ascending
branches:
- develop
exclude-labels:
- 'Skip changelog'
no-changes-template: 'This release contains minor changes and bugfixes.'
template: |
# Release Notes

$CHANGES

🎉 **Thanks to all contributors helping with this release!** 🎉
name-template: '$NEXT_PATCH_VERSION'
tag-template: '$NEXT_PATCH_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'Type: Enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'Type: Bug / Error'
- title: '🧰 Maintenance'
label: 'Type: Other'
change-template: '- $TITLE (#$NUMBER) @$AUTHOR'
sort-by: title
sort-direction: ascending
branches:
- develop
exclude-labels:
- 'Skip changelog'
no-changes-template: 'This release contains minor changes and bugfixes.'
template: |
# Release Notes
$CHANGES
🎉 **Thanks to all contributors helping with this release!** 🎉
38 changes: 19 additions & 19 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- Retained
# Label to use when marking an issue as stale
staleLabel: Inactive
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
If you are still interested in this issue and it is still relevant you can comment to revive it.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been been automatically closed due to a lack of activity.
This is done to maintain a clean list of issues that the community is interested in developing.
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- Retained
# Label to use when marking an issue as stale
staleLabel: Inactive
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
If you are still interested in this issue and it is still relevant you can comment to revive it.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been been automatically closed due to a lack of activity.
This is done to maintain a clean list of issues that the community is interested in developing.
38 changes: 19 additions & 19 deletions .github/workflows/checks
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
on: [push]

name: Static analysis

jobs:
test:
runs-on: ubuntu-latest
name: check tests
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: testomatio/check-tests@stable
with:
framework: cypress
tests: "./cypress/integration/**/**.spec.js"
token: ${{ secrets.GITHUB_TOKEN }}
has-tests-label: true

on: [push]
name: Static analysis
jobs:
test:
runs-on: ubuntu-latest
name: check tests
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: testomatio/check-tests@stable
with:
framework: cypress
tests: "./cypress/integration/**/**.spec.js"
token: ${{ secrets.GITHUB_TOKEN }}
has-tests-label: true
26 changes: 13 additions & 13 deletions .github/workflows/unlock-reopened-issues.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Unlock reopened issue

on:
issues:
types: [reopened]

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: Dunning-Kruger/unlock-issues@v1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
name: Unlock reopened issue
on:
issues:
types: [reopened]
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: Dunning-Kruger/unlock-issues@v1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Empty file modified .husky/commit-msg
100755 → 100644
Empty file.
Empty file modified .husky/pre-commit
100755 → 100644
Empty file.
42 changes: 21 additions & 21 deletions .tern-project
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"ecmaVersion": 6,
"libs": [
"browser"
],
"loadEagerly": [
"path/to/your/js/**/*.js"
],
"dontLoad": [
"node_modules/**",
"path/to/your/js/**/*.js"
],
"plugins": {
"modules": {},
"es_modules": {},
"node": {},
"doc_comment": {
"fullDocs": true,
"strong": true
}
}
{
"ecmaVersion": 6,
"libs": [
"browser"
],
"loadEagerly": [
"path/to/your/js/**/*.js"
],
"dontLoad": [
"node_modules/**",
"path/to/your/js/**/*.js"
],
"plugins": {
"modules": {},
"es_modules": {},
"node": {},
"doc_comment": {
"fullDocs": true,
"strong": true
}
}
}
Loading