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

Create graph in UI and rest client #7

Merged
merged 3 commits into from
Aug 14, 2020
Merged

Create graph in UI and rest client #7

merged 3 commits into from
Aug 14, 2020

Conversation

K-itKat20
Copy link
Collaborator

No description provided.

@macenturalxl1 macenturalxl1 merged commit acdda31 into jpelbertrios:gh-07-ui-develop Aug 14, 2020
jpelbertrios added a commit that referenced this pull request Aug 25, 2020
@jpelbertrios
Merge pull request #8 from K-itKat20/gh-7-ui-develop
63c4a1f 
Add Graphs base UI
jpelbertrios added a commit that referenced this pull request Sep 2, 2020
@jpelbertrios
Merge pull request #9 from K-itKat20/gh-7-ui-develop
86ef732 
Gh 07 ui develop- Merges with view graph and file drop zone for Add graph page
jpelbertrios added a commit that referenced this pull request Sep 3, 2020
@jpelbertrios
Merge pull request #10 from K-itKat20/gh-7-ui-develop
adda8c0 
User Guide page
jpelbertrios added a commit that referenced this pull request Sep 3, 2020
@jpelbertrios
Merge pull request #11 from K-itKat20/gh-7-ui-develop
f4cd1cc 
User Guide unit tests
macenturalxl1 pushed a commit that referenced this pull request Sep 4, 2020
@t11947
Merge pull request gchq#48 from macenturalxl1/gh-7-ui-prep
51acced 
GH-7 Initial infrastructure/ui separation
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge branch 'develop' of github.com:gchq/Kai into gh-7-ui-develop
52c2de8
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge pull request #12 from jpelbertrios/gh-7-ui-develop
c84dcce 
Gh 07 ui develop
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge pull request #13 from jpelbertrios/gh-7-ui-develop
2bbe108 
gitignore .idea folder
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge pull request #14 from jpelbertrios/gh-7-ui-develop
5a1cfe3 
gitignore iml
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge pull request #15 from jpelbertrios/gh-7-ui-develop
d22f439 
Gh 07 ui develop
macenturalxl1 added a commit that referenced this pull request Sep 4, 2020
@macenturalxl1
Merge pull request #16 from jpelbertrios/gh-7-ui-develop
00a3c58 
Travis fix
macenturalxl1 added a commit that referenced this pull request Sep 7, 2020
@macenturalxl1
Merge pull request #17 from jpelbertrios/gh-7-ui-develop
a52e879 
Gh 07 ui develop
macenturalxl1 added a commit that referenced this pull request Sep 10, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
1215d36 
…-Add/ViewGraph-error-handling
macenturalxl1 added a commit that referenced this pull request Sep 11, 2020
@macenturalxl1
Merge pull request #19 from jpelbertrios/gh-7-Add/ViewGraph-error-han…
aea7907 
…dling

Gh 07 add/view graph error handling
macenturalxl1 added a commit that referenced this pull request Sep 14, 2020
@macenturalxl1
Merge branch 'gh-7-Add/ViewGraph-error-handling' of github.com:jpelbe…
9e5df0c 
…rtrios/Kai into gh-7-Add/ViewGraph-error-handling
macenturalxl1 added a commit that referenced this pull request Sep 15, 2020
@macenturalxl1
Merge pull request #20 from jpelbertrios/gh-7-Add/ViewGraph-error-han…
875583f 
…dling

Gh 07 add/view graph error handling
macenturalxl1 added a commit that referenced this pull request Sep 15, 2020
@macenturalxl1
Merge pull request #21 from jpelbertrios/gh-7-ui-develop
edf6e84 
Gh 07 ui develop
macenturalxl1 added a commit that referenced this pull request Sep 15, 2020
@macenturalxl1
Merge pull request #22 from jpelbertrios/gh-7-ui-develop
0825872 
Fixed test
jpelbertrios added a commit that referenced this pull request Sep 17, 2020
@jpelbertrios
Merge branch 'gh-7-ui-develop' of https://github.com/jpelbertrios/Kai …
61e98ee 
…into gh-7-ui-develop
K-itKat20 pushed a commit that referenced this pull request Sep 24, 2020
Merge remote-tracking branch 'refs/remotes/origin/gh-7-ui-release'
5c827d9 
Conflicts:
	ui/package-lock.json
	ui/src/components/AddGraph/AddGraph.tsx
	ui/src/components/Navigation/NavigationDrawer.tsx
K-itKat20 pushed a commit that referenced this pull request Sep 25, 2020
Merge branch 'develop' into gh-7-ui-release
edf035b
macenturalxl1 added a commit that referenced this pull request Sep 25, 2020
@macenturalxl1
Merge pull request #23 from jpelbertrios/gh-7-delete-button
8e4134a 
Gh 07 delete button
macenturalxl1 added a commit that referenced this pull request Sep 28, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
5ebfc7c 
…-ui-release
macenturalxl1 added a commit that referenced this pull request Sep 28, 2020
@macenturalxl1
Merge branch 'develop' of github.com:gchq/Kai into gh-7-ui-develop
8c8c50e
macenturalxl1 added a commit that referenced this pull request Sep 28, 2020
@macenturalxl1
Merge pull request #24 from jpelbertrios/gh-7-ui-develop
f39b9a7 
Merge branch 'develop' of github.com:gchq/Kai into gh-7-ui-develop
macenturalxl1 added a commit that referenced this pull request Oct 5, 2020
@macenturalxl1
Merge branch 'gh-7-user-login' of github.com:jpelbertrios/Kai into gh-7…
3e894dc 
…-user-login
macenturalxl1 added a commit that referenced this pull request Oct 5, 2020
@macenturalxl1
Merge branch 'gh-7-user-login' of github.com:jpelbertrios/Kai into gh-7…
161d621 
…-user-login
macenturalxl1 added a commit that referenced this pull request Oct 5, 2020
@macenturalxl1
Merge pull request #25 from jpelbertrios/gh-7-user-login
343858d 
Gh 07 user login
macenturalxl1 added a commit that referenced this pull request Oct 5, 2020
@macenturalxl1
Merge pull request #26 from jpelbertrios/gh-7-user-login
5926e3d 
Gh 07 user login
macenturalxl1 added a commit that referenced this pull request Oct 6, 2020
@macenturalxl1
Merge pull request #27 from jpelbertrios/gh-7-ui-develop
4c952fd 
Gh 07 ui develop
macenturalxl1 added a commit that referenced this pull request Oct 7, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
cd2b6c1 
…-user-friendly
macenturalxl1 added a commit that referenced this pull request Oct 12, 2020
@macenturalxl1
Merge pull request #28 from jpelbertrios/gh-7-user-friendly
fbab5d5 
Gh 07 user friendly
macenturalxl1 added a commit that referenced this pull request Oct 12, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
f5763e5 
…-user-login
K-itKat20 pushed a commit that referenced this pull request Oct 13, 2020
Merge remote-tracking branch 'origin/gh-7-ui-develop' into gh-7-ui-up…
f0bb615 
…load
K-itKat20 pushed a commit that referenced this pull request Oct 13, 2020
Merge branch 'gh-7-ui-upload' into gh-7-ui-develop
4f32fea
K-itKat20 pushed a commit that referenced this pull request Oct 26, 2020
Merge remote-tracking branch 'origin/gh-7-key-press' into gh-7-key-press
0b0d21c
K-itKat20 pushed a commit that referenced this pull request Oct 26, 2020
Merge branch 'gh-7-key-press' into origin/gh-7-key-press
5ca5b50
K-itKat20 pushed a commit that referenced this pull request Oct 26, 2020
Merge remote-tracking branch 'origin/gh-7-ui-develop' into gh-7-ui-de…
8d1da6c 
…velop
macenturalxl1 added a commit that referenced this pull request Oct 26, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
44a958b 
…-ui-develop
K-itKat20 pushed a commit that referenced this pull request Oct 28, 2020
Merge remote-tracking branch 'origin/gh-7-sign-out' into gh-7-sign-out
c2d8e1d
K-itKat20 pushed a commit that referenced this pull request Oct 29, 2020
Merge branch 'gh-7-sign-out' into origin/gh-7-ui-develop
e07c67b
macenturalxl1 added a commit that referenced this pull request Nov 18, 2020
@macenturalxl1
Merge branch 'develop' of github.com:gchq/Kai into gh-7-ui-develop
58affc3
K-itKat20 pushed a commit that referenced this pull request Nov 25, 2020
Merge remote-tracking branch 'origin/gh-7-dockerise-ui' into gh-7-doc…
eeda97b 
…kerise-ui
macenturalxl1 added a commit that referenced this pull request Nov 30, 2020
@macenturalxl1
Merge pull request #29 from jpelbertrios/gh-7-dockerise-ui
5f0d58d 
Gh 07 dockerise ui
macenturalxl1 added a commit that referenced this pull request Dec 1, 2020
@macenturalxl1
Merge pull request #30 from jpelbertrios/gh-7-dockerise-ui
5e473a6 
Gh 07 dockerise ui
macenturalxl1 added a commit that referenced this pull request Dec 7, 2020
@macenturalxl1
Merge pull request #31 from jpelbertrios/gh-7-dockerise-ui
4dc1c05 
Gh 07 dockerise UI
macenturalxl1 added a commit that referenced this pull request Dec 9, 2020
@macenturalxl1
Merge pull request #32 from jpelbertrios/gh-7-dockerise-ui
bc76bf9 
NavigationAppbar ts-ignore comment
K-itKat20 pushed a commit that referenced this pull request Dec 14, 2020
Merge remote-tracking branch 'origin/gh-7-ui-develop' into gh-7-ui-de…
1ae74e8 
…velop
K-itKat20 pushed a commit that referenced this pull request Dec 14, 2020
Revert "Merge remote-tracking branch 'origin/gh-7-ui-develop' into gh-7…
8030e14 
…-ui-develop"

This reverts commit 1ae74e8.
macenturalxl1 added a commit that referenced this pull request Dec 16, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
57b9168 
…-ui-develop
macenturalxl1 added a commit that referenced this pull request Dec 16, 2020
@macenturalxl1
Merge branch 'gh-7-ui-develop' of github.com:jpelbertrios/Kai into gh-7…
f32ab8f 
…-ui-develop
K-itKat20 pushed a commit that referenced this pull request Dec 24, 2020
Merge branch 'gh-7-linting' into gh-7-ui-develop
b6f355f
macenturalxl1 added a commit that referenced this pull request Jan 12, 2021
@macenturalxl1
Merge pull request #33 from jpelbertrios/gh-7-displayuserdetails
19cc56c 
Gh 07 displayuserdetails
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@K-itKat20 @macenturalxl1