Commits · 574192c9bf3bed191c078e7910d21af4ab4477c0 · aflab / astrogeology / ISIS3 · GitLab

Jun 26, 2018
- Merged ipce into ipceCnetHealth · 574192c9
  Kristin Berry authored Jun 26, 2018
  
  574192c9
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · a45282e9
  Kristin Berry authored Jun 26, 2018
  
  a45282e9
- Removed comment · 33333760
  Kristin Berry authored Jun 26, 2018
  
  33333760
- Fixed numPointsBelowMeasureThreshold() to return the correct value · 45d7f5f1
  Kristin Berry authored Jun 26, 2018
  
  45d7f5f1
Jun 25, 2018
- Merge pull request #286 from kberryUSGS/ipceCnetHealth · e0801ed8
  Jesse Mapel authored Jun 25, 2018
  e0801ed8
- Made minor edit suggested in code review · 68238c98
  Kristin Berry authored Jun 25, 2018
  
  68238c98
- Updated ControlNet and ControlNetVitals to fix problem with... · 0ce01c73
  Kristin Berry authored Jun 25, 2018
  0ce01c73
- Merge pull request #283 from jessemapel/ipce · 1601bd16
  Kristin authored Jun 25, 2018
  1601bd16
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into ipce_dev · 9038954a
  Jesse Mapel authored Jun 25, 2018
  
  9038954a
- Fixed signals in ControlNet · 98f0edb8
  Jesse Mapel authored Jun 25, 2018
  
  98f0edb8
Jun 22, 2018
- Merge pull request #276 from USGS-Astrogeology/ipceDocks · c27fb8d1
  Kristin authored Jun 22, 2018
  c27fb8d1
- Merge branch 'ipceCnetHealth' into ipceDocks · 7baff3e1
  Kristin authored Jun 22, 2018
  
  7baff3e1
- Merge pull request #277 from kdl222/m0703 · c7b5d380
  Kristin authored Jun 22, 2018
  c7b5d380
- Fixed Prog26 errors. · 0686b054
  Kaitlyn Lee authored Jun 22, 2018
  
  0686b054
- Made some changes to clarify exactly what happens if the ddd file has an old header format. · 01cffb75
  Kaitlyn Lee authored Jun 22, 2018
  
  01cffb75
- Merge pull request #274 from USGS-Astrogeology/ipceCnetHealth · 706afaf5
  AgoinsUSGS authored Jun 22, 2018
  706afaf5
- Resolve merge conflicts · f9120520
  Kristin Berry authored Jun 22, 2018
  
  f9120520
- Merge pull request #254 from makaylas/ipce · 93645897
  Kristin authored Jun 22, 2018
  93645897
- Merge pull request #271 from kdl222/m0703 · 8a508cb4
  Kristin authored Jun 22, 2018
  8a508cb4
Jun 21, 2018
- Merge pull request #272 from jessemapel/ipce · 92ba0301
  Kristin authored Jun 21, 2018
  92ba0301
- Added history for pointIgnored and pointUnIgnored in ControlNet and ControlPoint. · 0f19ed1d
  Jesse Mapel authored Jun 21, 2018
  
  0f19ed1d
- Fixed control point ignoring and unignored in ControlNet · 565557c2
  Jesse Mapel authored Jun 21, 2018
  
  565557c2
- Updated test to remove path of the input files. · bf12d998
  Kaitlyn Lee authored Jun 21, 2018
  
  bf12d998
- Merge pull request #269 from jessemapel/ipce · 670f49ff
  Kristin authored Jun 21, 2018
  670f49ff
- Cleaned up QChart includes · d2070657
  Jesse Mapel authored Jun 21, 2018
  
  d2070657
- Merge pull request #244 from kdl222/m0703 · a9f6d788
  Makayla Shepherd authored Jun 21, 2018
  a9f6d788
- Merge pull request #256 from kdl222/m05188 · 2730619b
  Makayla Shepherd authored Jun 21, 2018
  2730619b
- Merge pull request #232 from AgoinsUSGS/Signals_Slots · 5669639e
  Jesse Mapel authored Jun 21, 2018
  5669639e
- Merge pull request #266 from USGS-Astrogeology/ipceCnetHealth · 58f83821
  Kristin authored Jun 21, 2018
  58f83821
- Merge pull request #268 from jessemapel/ipceCnetHealth · bbbf65bd
  Kristin authored Jun 21, 2018
  bbbf65bd
- Clean up in ControlNet · 6939e36f
  Jesse Mapel authored Jun 21, 2018
  
  6939e36f
Jun 20, 2018
- Merge pull request #267 from jessemapel/ipceCnetHealth · 5bc9b6b0
  Kristin authored Jun 20, 2018
  5bc9b6b0
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 0629feae
  Jesse Mapel authored Jun 20, 2018
  
  0629feae
- Removed QtCharts references · a19e69c5
  Jesse Mapel authored Jun 20, 2018
  
  a19e69c5
- Merge pull request #265 from kdl222/tabDocks · c55e380d
  Tracie Sucharski authored Jun 20, 2018
  c55e380d
- Fixed merge conflicts · d8b6ebac
  Adam Goins authored Jun 20, 2018
  
  d8b6ebac
- Fixed merge conflicts · 088b404a
  Adam Goins authored Jun 20, 2018
  
  088b404a
- Fixed merge conflicts · 3b0e0c04
  Adam Goins authored Jun 20, 2018
  
  3b0e0c04
- Added dcoumentation for health widget · 2f1294ac
  Adam Goins authored Jun 20, 2018
  
  2f1294ac
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into tabDocks · 3d9411e2
  Kaitlyn Lee authored Jun 20, 2018
  
  3d9411e2