Commits · 036dbca1e12c61d16fa68c9a2257a59d508f1f49 · ASTRON SDC / ESCAPE WP5 / ESAP GUI

Jun 08, 2021
- Merge branch 'dev-nico' into 'master' · 036dbca1
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!18
  036dbca1
- parsing shopping basket items as json · b4b9b19f
  Nico Vermaas authored 3 years ago
  
  b4b9b19f
- parsing shopping basket items as json · df82871b
  Nico Vermaas authored 3 years ago
  
  df82871b
- shopping basket button that shows contents of shopping basket · 1a039fc6
  Nico Vermaas authored 3 years ago
  
  1a039fc6
Jun 07, 2021
- Merge remote-tracking branch 'origin/dev-nico' into dev-nico · 6b750a43
  Nico Vermaas authored 3 years ago
  
  6b750a43
- Merge branch 'master' into 'dev-nico' · 3f17d7f4
  Nico Vermaas authored 3 years ago
  
  Master See merge request astron-sdc/esap-gui!17
  3f17d7f4
- Merge branch 'esap-gui-ida-dev' into 'master' · cbb1d5a0
  Nico Vermaas authored 3 years ago
  
  Modify IDA UI to read notebooks/jhubs from REST API See merge request astron-sdc/esap-gui!16
  cbb1d5a0
Jun 04, 2021
- work in progress on MyBasketPage · fe7ef287
  Nico Vermaas authored 3 years ago
  
  fe7ef287
- Modify IDA UI to read notebooks/jhubs from REST API · ba016b72
  stvoutsin authored 3 years ago
  
  ba016b72
- Merge branch 'dev-nico' into 'master' · 221390b0
  Nico Vermaas authored 3 years ago
  
  abandoned the shoppingbasket mechanism for VOReg (functionality is too inmature) See merge request astron-sdc/esap-gui!15
  221390b0
- abandoned the shoppingbasket mechanism for VOReg (functionality is too inmature) · 53c6296f
  Nico Vermaas authored 3 years ago
  
  53c6296f
- Merge branch 'dev-nico' into 'master' · 1516aac2
  Nico Vermaas authored 3 years ago
  
  add shoppingbasket functionality to 'apertif' and 'astron_vo' archives See merge request astron-sdc/esap-gui!14
  1516aac2
- add shoppingbasket functionality to 'apertif' and 'astron_vo' archives · 3b54aae6
  Nico Vermaas authored 3 years ago
  
  3b54aae6
Jun 03, 2021
- Merge branch 'dev-nico' into 'master' · e23fef46
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!13
  e23fef46
- accessing samp.js and votable.js · a2742b07
  Nico Vermaas authored 3 years ago
  
  a2742b07
- storing logo as web accessable assets · 483f065c
  Nico Vermaas authored 3 years ago
  
  483f065c
- storing logo as web accessable assets · ee01ec50
  Nico Vermaas authored 3 years ago
  
  ee01ec50
Jun 01, 2021
- Merge branch 'dev-nico' into 'master' · d2952e17
  Nico Vermaas authored 3 years ago
  
  add shopping basket to Apertif See merge request astron-sdc/esap-gui!12
  d2952e17
- add shopping basket to Apertif · 782e1a43
  Nico Vermaas authored 3 years ago
  
  add some icons to buttons add (stub) shopping basket in navbar
  782e1a43
May 28, 2021
- Merge branch 'dev-nico' into 'master' · 2446e077
  Nico Vermaas authored 3 years ago
  
  bugfix in location of samp.js See merge request astron-sdc/esap-gui!11
  2446e077
- bugfix in location of samp.js · f049ea15
  Nico Vermaas authored 3 years ago
  
  f049ea15
May 18, 2021
- Merge branch 'dev-nico' into 'master' · 52269b6f
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!10
  52269b6f
- connect SAMP to ShoppingBasket · dc476ac3
  Nico Vermaas authored 3 years ago
  
  dc476ac3
Apr 30, 2021
- test deploy nico-dev branch · 387f7221
  Nico Vermaas authored 3 years ago
  
  387f7221
- Merge branch 'dev-nico' into 'master' · 0ba42a40
  Nico Vermaas authored 3 years ago
  
  create nico-dev branch and change CI/CD pipelines See merge request astron-sdc/esap-gui!9
  0ba42a40
- create nico-dev branch and change CI/CD pipelines · 5388a7a0
  Nico Vermaas authored 3 years ago
  
  5388a7a0
Mar 23, 2021
- adding CI/CD pipeline for acceptance · 52e74baa
  Nico Vermaas authored 4 years ago
  
  52e74baa
- adding CI/CD pipeline for acceptance · 03364341
  Nico Vermaas authored 4 years ago
  
  03364341
Mar 05, 2021
- Merge branch 'esap-gui-dev' into 'master' · 87708ef7
  Nico Vermaas authored 4 years ago
  
  Esap gui dev See merge request astron-sdc/esap-gui!8
  87708ef7
Feb 23, 2021
- adding version (because I can't see what is deployed) · cc389ad0
  Nico Vermaas authored 4 years ago
  
  cc389ad0
- Merge remote-tracking branch 'origin/esap-gui-dev' into esap-gui-dev · a636514e
  Nico Vermaas authored 4 years ago
  
  a636514e
- adding version (because I can't see what is deployed) · 08ad26f3
  Nico Vermaas authored 4 years ago
  
  08ad26f3
- Merge branch 'master' into 'esap-gui-dev' · f095828b
  Nico Vermaas authored 4 years ago
  
  # Conflicts: # .gitlab-ci.yml # src/contexts/GlobalContext.js
  f095828b
- adding username · 2bbd307c
  Nico Vermaas authored 4 years ago
  
  2bbd307c
- adding username · d6f1ce98
  Nico Vermaas authored 4 years ago
  
  d6f1ce98
- adding username · 1c9748fc
  Nico Vermaas authored 4 years ago
  
  1c9748fc
Feb 08, 2021
- sdc.astron.nl => sdc-dev.astron.nl · d515a39c
  Nico Vermaas authored 4 years ago
  
  d515a39c
- sdc.astron.nl => sdc-dev.astron.nl · 0d0f7704
  Nico Vermaas authored 4 years ago
  
  0d0f7704
- sdc.astron.nl => sdc-dev.astron.nl · 4a44bdc8
  Nico Vermaas authored 4 years ago
  
  4a44bdc8
Jan 07, 2021
- adding href to http links to make it links · a795a90d
  Nico Vermaas authored 4 years ago
  
  a795a90d