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.

Sign up for GitHub

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

Jump to bottom

Hierarchical Charts Popurri #124

Merged
merged 29 commits into from
May 8, 2022
Merged

Hierarchical Charts Popurri #124

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
16e6906
Added extra option (standalone dashboard by URL to build config
nielsdejong Apr 5, 2022
350a7b4
WIP on dockerfile
nielsdejong Apr 5, 2022
a4384cd
Reverted back to old Docker config
nielsdejong Apr 5, 2022
6af332a
Fixed import for react-color-picker, clean up Dockerfile
nielsdejong Apr 5, 2022
c168e98
Updated material-ui-color-picker dependency
nielsdejong Apr 5, 2022
24e4efc
Report updates base on global params
BennuFire Apr 5, 2022
ed18d83
Update CardView.tsx
BennuFire Apr 5, 2022
b45f97a
Hierarchical Charts
BennuFire Apr 22, 2022
083e1e1
Added extra option (standalone dashboard by URL to build config
nielsdejong Apr 5, 2022
0747e85
WIP on dockerfile
nielsdejong Apr 5, 2022
f23cd22
Reverted back to old Docker config
nielsdejong Apr 5, 2022
645b03d
Fixed import for react-color-picker, clean up Dockerfile
nielsdejong Apr 5, 2022
e68c0fb
Updated material-ui-color-picker dependency
nielsdejong Apr 5, 2022
17447b5
Update CardView.tsx
BennuFire Apr 5, 2022
dba1601
Hierarchical Charts
BennuFire Apr 22, 2022
4624492
Updated version
nielsdejong Apr 23, 2022
1a780e3
Added extra option (standalone dashboard by URL to build config
nielsdejong Apr 5, 2022
05b95ed
Merge
nielsdejong Apr 23, 2022
a67b349
Reverted back to old Docker config
nielsdejong Apr 5, 2022
d0c0910
Merge
nielsdejong Apr 23, 2022
11a5262
Updated material-ui-color-picker dependency
nielsdejong Apr 5, 2022
ee6cdc0
Merge branch 'develop' of github.com:BennuFire/neodash into develop
nielsdejong Apr 23, 2022
a459758
Added missing line in Dockerfile
nielsdejong Apr 25, 2022
96fec51
Icon + quick fix
BennuFire May 6, 2022
b31b8dc
Added comments to describe functionality
nielsdejong May 8, 2022
0731607
Fixed comments on PR review for hierarchy reports
nielsdejong May 8, 2022
58afb38
Updated Dockerfile and package.json
nielsdejong May 8, 2022
fbffb64
Removed console.log
nielsdejong May 8, 2022
945ea94
Merge branch 'develop' into develop
nielsdejong May 8, 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
Prev Previous commit
Next Next commit
Updated material-ui-color-picker dependency
  • Loading branch information
@nielsdejong
nielsdejong committed Apr 23, 2022
commit e68c0fb0d7e4c0c4506d9d6dcad899db703ca9e6
4 changes: 0 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,7 @@
"d3-scale-chromatic": "^3.0.0",
"html2canvas": "^1.4.1",
"leaflet": "^1.7.1",
<<<<<<< HEAD
"material-ui-color-picker": "github:nielsdejong/material-ui-color-picker#c1bae552c1daf81952bf0478d7f71c1a416527d3",
=======
"material-ui-color-picker": "github:nielsdejong/material-ui-color-picker#be90ea819f30c177a78549a091635da26d40ee57",
>>>>>>> 6af332a (Fixed import for react-color-picker, clean up Dockerfile)
"neo4j-client-sso": "^1.2.2",
"react": "^17.0.2",
"react-cool-dimensions": "^2.0.7",
Expand Down