Commits · e1be3e8b81f8ab0bb54a874e312c062f95d03204 · aflab / astrogeology / ISIS3 · GitLab

Jun 23, 2018
- Fixing merge commits · e1be3e8b
  Makayla Shepherd authored Jun 23, 2018
  
  e1be3e8b
- Merge branch 'ipceDocks' into ipceDocks · b5cda25e
  Makayla Shepherd authored Jun 22, 2018
  
  b5cda25e
Jun 22, 2018
- Merge branch 'ipceCnetHealth' into ipceDocks · 7baff3e1
  Kristin authored Jun 22, 2018
  
  7baff3e1
- Resolve merge conflicts · f9120520
  Kristin Berry authored Jun 22, 2018
  
  f9120520
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
- 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 #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
- Fixed merge conflict · bf7e049b
  Makayla Shepherd authored Jun 20, 2018
  
  bf7e049b
Jun 20, 2018
- Fixed things that were broken by the merge · fd2e7cba
  Makayla Shepherd authored Jun 20, 2018
  
  fd2e7cba
- 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
- Added documentation to historyEntry · 59fcf177
  Adam Goins authored Jun 20, 2018
  
  59fcf177
Jun 19, 2018
- Added history comment · a91dfdaf
  Adam Goins authored Jun 19, 2018
  
  a91dfdaf
- Merge branch 'health_monitor_documentation' of github.com:AgoinsUSGS/ISIS3 into Gui_Updates · 9fb34a31
  Adam Goins authored Jun 19, 2018
  
  9fb34a31
- Added progresssbar visualations for point free,fixed,constrained, added... · 635d4270
  Adam Goins authored Jun 19, 2018
  635d4270
- fix typo in history comment · 55930658
  Adam Goins authored Jun 19, 2018
  
  55930658
- Fixes updating references in selectLeftMeasure and selectRightMeasure to fix a... · 7a7ccdd2
  Adam Goins authored Jun 19, 2018
  7a7ccdd2
- Gave the ControlHealthMonitorView() a reference to the directory instance... · fc3715aa
  Adam Goins authored Jun 19, 2018
  fc3715aa
- Added tabbing capabilities for detached views. · 21145c14
  Kaitlyn Lee authored Jun 19, 2018
  
  21145c14
- Forgot to copy over OpenProjectWorkOrder · 25dbe95b
  Makayla Shepherd authored Jun 19, 2018
  
  25dbe95b
- 1. QSettings now saves to the project directory if the user saves the project.... · cfe3d265
  Makayla Shepherd authored Jun 19, 2018
  cfe3d265
Jun 18, 2018
- Merge pull request #259 from SgStapleton/ipceDocksWindowChange · c727e361
  Tracie Sucharski authored Jun 18, 2018
  c727e361
- Merge branch 'ipceDocks' into ipceDocksWindowChange · f9889ee9
  Tracie Sucharski authored Jun 18, 2018
  
  f9889ee9
- Adding specific history comments since resolving a redmine ticket · 11ac77c4
  Summer Stapleton authored Jun 18, 2018
  
  11ac77c4
- Merge pull request #240 from kdl222/cleanupDocks · 339391c1
  Makayla Shepherd authored Jun 18, 2018
  339391c1
- Removing debug statements · 91e82078
  Summer Stapleton authored Jun 18, 2018
  
  91e82078
- Added ControlHealthMonitorWorkOrder to WorkOrderFactory. · 9cccd59c
  Adam Goins authored Jun 18, 2018
  
  9cccd59c