Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

ESAP GUI
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

0be8125b

Commit 0be8125b authored 3 years ago by Nico Vermaas

Downloads
- Plain Diff

Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!66

parents 7eb65aaa 7314e205

No related branches found

No related tags found

2 merge requests!67Merge branch 'dev-nico' into 'master',!66Dev nico

Pipeline #18813 passed 3 years ago

Stage: build

Stage: deploy

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
src/assets/Interactive.css 1 addition, 1 deletion

src/assets/Interactive.css
src/components/basket/MyBasketPage.js 16 additions, 0 deletions

src/components/basket/MyBasketPage.js
src/components/query/QueryIVOARegistry.js 2 additions, 3 deletions

src/components/query/QueryIVOARegistry.js
src/components/services/layout/IVOALayout.js 62 additions, 0 deletions

src/components/services/layout/IVOALayout.js
src/components/services/query_results/IVOAResults.js 92 additions, 0 deletions

src/components/services/query_results/IVOAResults.js
src/routes/Routes.js 1 addition, 1 deletion

src/routes/Routes.js

with 176 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment