Commits · f71962f6444efc6d83a43c95a693725894cdf9ba · ASTRON SDC / ESCAPE WP5 / ESAP GUI

Jul 23, 2021
- Merge branch 'dev-nico' into 'master' · f71962f6
  Nico Vermaas authored 3 years ago
  
  preparing for future aladin functionality See merge request astron-sdc/esap-gui!39
  f71962f6
- preparing for future aladin functionality · 593d056e
  Nico Vermaas authored 3 years ago
  
  593d056e
Jul 20, 2021
- Merge branch 'dev-nico' into 'master' · a99eda01
  Nico Vermaas authored 3 years ago
  
  add token expiration info See merge request astron-sdc/esap-gui!38
  a99eda01
- add token expiration info · 8982e651
  Nico Vermaas authored 3 years ago
  
  8982e651
Jul 16, 2021
- Merge branch 'dev-nico' into 'master' · ba8dbe07
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!36
  ba8dbe07
- remove 'id_token' from token button (only 'access_token' is needed) · 2db2befd
  Nico Vermaas authored 3 years ago
  
  2db2befd
Jul 13, 2021
- give an alert when ESAP-API could not be reached · 87f26607
  Nico Vermaas authored 3 years ago
  
  87f26607
Jul 12, 2021
- troubleshooting CORS error · 0ddc3917
  Nico Vermaas authored 3 years ago
  
  0ddc3917
- troubleshooting CORS error - api_host back to 5555 · b7f6ffd7
  Nico Vermaas authored 3 years ago
  
  b7f6ffd7
- troubleshooting CORS error · 1caa8bc9
  Nico Vermaas authored 3 years ago
  
  1caa8bc9
Jul 09, 2021
- Merge branch 'dev-nico' into 'master' · e7636f65
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!35
  e7636f65
- user friendly presentation of shopping basket items (apertif and astron-vo) (jira ticket 243) · d1609c99
  Nico Vermaas authored 3 years ago
  
  d1609c99
- user friendly presentation of shopping basket items (apertif and astron-vo) (jira ticket 243) · 5e59d13b
  Nico Vermaas authored 3 years ago
  
  5e59d13b
- user friendly presentation of shopping basket items (apertif and astron-vo) (jira ticket 243) · decb8586
  Nico Vermaas authored 3 years ago
  
  decb8586
- Merge branch 'dev-nico' into 'master' · b15ef39b
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!34
  b15ef39b
- enable un/re-selecting items in shopping basket before saving (jira ticket 243) · 5870ce66
  Nico Vermaas authored 3 years ago
  
  5870ce66
Jul 08, 2021

Merge branch 'pagination-fix' into 'master' · b9a9e7cf

Nico Vermaas authored 3 years ago

Fixed broken faulty pagination logic that broke the Zooniverse GUI.

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

b9a9e7cf

Jul 07, 2021
- Fixed broken faulty pagination logic that broke the Zooniverse GUI. · a8f41049
  Hugh Dickinson authored 3 years ago
  
  a8f41049
Jul 06, 2021
- Merge branch 'master' into 'dev-nico' · 8a5a3c62
  Nico Vermaas authored 3 years ago
  
  Master See merge request astron-sdc/esap-gui!32
  8a5a3c62
- Merge branch 'esap-gui-ida-dev' into 'master' · 2895fdae
  Nico Vermaas authored 3 years ago
  
  Change to use api_host & fixed default workflow select location See merge request astron-sdc/esap-gui!31
  2895fdae
- Merge branch 'dev-nico' into 'master' · 229c24c4
  Nico Vermaas authored 3 years ago
  
  switching to esap-api on port 80 instead of port 5555 See merge request astron-sdc/esap-gui!30
  229c24c4
- switching to esap-api on port 80 instead of port 5555 · c84e7464
  Nico Vermaas authored 3 years ago
  
  c84e7464
Jul 05, 2021
- Change to use api_host & fixed default workflow select location · 38925c84
  stvoutsin authored 3 years ago
  
  38925c84
Jul 02, 2021
- Merge branch 'dev-nico' into 'master' · f8ba0366
  Nico Vermaas authored 3 years ago
  
  fixed loading error on '/esap-gui/interactive' url See merge request astron-sdc/esap-gui!29
  f8ba0366
- fixed loading error on '/esap-gui/interactive' url · 40e17773
  Nico Vermaas authored 3 years ago
  
  40e17773
- Merge branch 'dev-nico' into 'master' · ef4d5c65
  Nico Vermaas authored 3 years ago
  
  bugfix: "Clicking 'Query this Dataset` often shows the IVOA query" See merge request astron-sdc/esap-gui!28
  ef4d5c65
- bugfix: "Clicking 'Query this Dataset` often shows the IVOA query" · 15e078d1
  Nico Vermaas authored 3 years ago
  
  (Jira ticket SDC-230)
  15e078d1
- keep user logged in on refresh page (if authenticated and token is not expired) · 862ca8f1
  Nico Vermaas authored 3 years ago
  
  862ca8f1
- Merge branch 'dev-nico' into 'master' · b3b53338
  Nico Vermaas authored 3 years ago
  
  also add 'access_token' to token button See merge request astron-sdc/esap-gui!27
  b3b53338
- also add 'access_token' to token button · 67714075
  Nico Vermaas authored 3 years ago
  
  67714075
Jul 01, 2021
- Merge branch 'dev-nico' into 'master' · c885b1cb
  Nico Vermaas authored 3 years ago
  
  add shopping_basket functionality to rucio results See merge request astron-sdc/esap-gui!26
  c885b1cb
- add shopping_basket functionality to rucio results · a0a7b276
  Nico Vermaas authored 3 years ago
  
  a0a7b276
Jun 29, 2021
- Merge branch 'dev-nico' into 'master' · 3015f431
  Nico Vermaas authored 3 years ago
  
  add token to clipboard button See merge request astron-sdc/esap-gui!25
  3015f431
- add token to clipboard button · fbf89244
  Nico Vermaas authored 3 years ago
  
  fbf89244
Jun 28, 2021
- Merge branch 'dev-nico' into 'master' · 4a422cb3
  Nico Vermaas authored 3 years ago
  
  fixing some bugs (and introducting new ones) See merge request astron-sdc/esap-gui!24
  4a422cb3
- fixing some bugs (and introducting new ones) · 14b03504
  Nico Vermaas authored 3 years ago
  
  14b03504
Jun 22, 2021
- Merge branch 'dev-nico' into 'master' · 6effe19c
  Nico Vermaas authored 3 years ago
  
  add EmptyShoppingBasket and API buttons See merge request astron-sdc/esap-gui!23
  6effe19c
- add EmptyShoppingBasket and API buttons · 32979d3c
  Nico Vermaas authored 3 years ago
  
  some styling
  32979d3c
- add EmptyShoppingBasket and API buttons · c1d97e5e
  Nico Vermaas authored 3 years ago
  
  some styling
  c1d97e5e
Jun 18, 2021
- Merge branch 'dev-nico' into 'master' · a39b0909
  Nico Vermaas authored 3 years ago
  
  Dev nico See merge request astron-sdc/esap-gui!22
  a39b0909