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

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 '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
- move SaveShoppingBasket button to navbar · 0f425561
  Nico Vermaas authored 3 years ago
  
  0f425561
- move SaveShoppingBasket button to navbar · f7342480
  Nico Vermaas authored 3 years ago
  
  f7342480
- Merge branch 'dev-nico' into 'master' · 03238362
  Nico Vermaas authored 3 years ago
  
  shopping basket icon/button responds to change in contents and saving See merge request astron-sdc/esap-gui!21
  03238362
- shopping basket icon/button responds to change in contents and saving · cbd78d9f
  Nico Vermaas authored 3 years ago
  
  cbd78d9f
Jun 14, 2021
- Merge branch 'dev-nico' into 'master' · c41dcfd2
  Nico Vermaas authored 3 years ago
  
  finally solved the BasketContext problem See merge request astron-sdc/esap-gui!20
  c41dcfd2
- working on removing items from the shopping basket · b799f458
  Nico Vermaas authored 3 years ago
  
  b799f458
Jun 11, 2021
- finally solved the BasketContext problem · 17e910c0
  Nico Vermaas authored 3 years ago
  
  (make sure components are only wrapped once by it)
  17e910c0
- Merge branch 'dev-nico' into 'master' · ebce1777
  Nico Vermaas authored 3 years ago
  
  handling shopping items in basket See merge request astron-sdc/esap-gui!19
  ebce1777
Jun 10, 2021
- handling shopping items in basket · 71698c61
  Nico Vermaas authored 3 years ago
  
  71698c61
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