Commits · fd25c12da925c00d0a5da6dcb96d6881031c6f19 · aflab / astrogeology / ISIS3 · GitLab

Jul 03, 2018
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceDocks · fd25c12d
  Kaitlyn Lee authored Jul 03, 2018
  
  fd25c12d
- Merge pull request #322 from jessemapel/ipceCnetHealth · 8c2f9ce5
  Kristin authored Jul 03, 2018
  8c2f9ce5
- Fixed control net health monitor counters not working correctly. · 69b9da7b
  Jesse Mapel authored Jul 03, 2018
  
  69b9da7b
- Fixed control points not being deleted correctly in ControlNet. · c7f80285
  Jesse Mapel authored Jul 03, 2018
  
  c7f80285
Jul 02, 2018
- Merge pull request #319 from jessemapel/ipceCnetHealth · c45ab58a
  AgoinsUSGS authored Jul 02, 2018
  c45ab58a
- Fixed a bad serial number in the BundleSolutionInfo unitTest · 81bacd2b
  Jesse Mapel authored Jul 02, 2018
  
  81bacd2b
- Merge pull request #312 from kberryUSGS/ipceCnetHealth · 3ad71c1d
  Jesse Mapel authored Jul 02, 2018
  3ad71c1d
- Fixed merge conflicts · 172e5b63
  Kristin Berry authored Jul 02, 2018
  
  172e5b63
- Merge pull request #318 from jessemapel/ipceCnetHealth · da0d3267
  AgoinsUSGS authored Jul 02, 2018
  da0d3267
- Fixed text color and valid measure counting in control net monitor. · 7e806bd8
  Jesse Mapel authored Jul 02, 2018
  
  7e806bd8
- Merge branch 'ipce' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 03a41ac5
  Jesse Mapel authored Jul 02, 2018
  
  03a41ac5
- Merge pull request #311 from AgoinsUSGS/final_changes · 7a8b0b8f
  Jesse Mapel authored Jul 02, 2018
  7a8b0b8f
- Merge branch 'dev' into ipce · fe9cdc90
  Makayla Shepherd authored Jul 02, 2018
  
  fe9cdc90
Jul 01, 2018
- Merge pull request #255 from makaylas/ipceDocks · 5dd4f0e7
  Kristin authored Jul 01, 2018
  5dd4f0e7
- Merge branch 'ipceDocks' into ipceDocks · 6e1d727a
  Makayla Shepherd authored Jul 01, 2018
  
  6e1d727a
- Merge pull request #263 from SgStapleton/ipceDocksWindowChange · 0044412c
  Makayla Shepherd authored Jul 01, 2018
  0044412c
Jun 30, 2018
- Fixed method header comment · 3d3a14fd
  Makayla Shepherd authored Jun 30, 2018
  
  3d3a14fd
- Deleted a double declaration of a method · 4c52ba1a
  Makayla Shepherd authored Jun 30, 2018
  
  4c52ba1a
- Merge pull request #306 from makaylas/ipceProgress · 0a1da587
  ihumphrey authored Jun 30, 2018
  0a1da587
- Made changes based on PR comments · 94604724
  Makayla Shepherd authored Jun 30, 2018
  
  94604724
Jun 29, 2018
- Merge pull request #310 from jessemapel/ipce · 93d0ac4f
  Kristin authored Jun 29, 2018
  93d0ac4f
- Added AddEdge() and RemoveEdge() to ControlNet to clean up code. Added documentation · 189f8083
  Kristin Berry authored Jun 29, 2018
  
  189f8083
- use setters in ControlMEasure operator= · 5c92ee87
  Adam Goins authored Jun 29, 2018
  
  5c92ee87
- Store off old edit lock value before using it · 8016fdb7
  Adam Goins authored Jun 29, 2018
  
  8016fdb7
- Fixed changes in ControlPointEditWidget that caused seg faults. · bb5d7636
  Jesse Mapel authored Jun 29, 2018
  
  bb5d7636
- fixed typo · adbcac99
  Adam Goins authored Jun 29, 2018
  
  adbcac99
- Merge with upstream · c3e91e37
  Kristin Berry authored Jun 29, 2018
  
  c3e91e37
- made sure points aren't ignored before grabbing them in ControlNetVtials · 253b67c9
  Adam Goins authored Jun 29, 2018
  
  253b67c9
- Fixed ControlPoint::operator= to use setters · 2484d4e7
  Adam Goins authored Jun 29, 2018
  
  2484d4e7
- Merge pull request #308 from jessemapel/ipce · 58e7d8f4
  AgoinsUSGS authored Jun 29, 2018
  58e7d8f4
- Merge pull request #304 from AgoinsUSGS/bugginess · 3a42d984
  Kristin authored Jun 29, 2018
  3a42d984
- Merge branch 'ipceCnetHealth' into bugginess · 34da9d8b
  Kristin authored Jun 29, 2018
  
  34da9d8b
- Merge pull request #297 from AgoinsUSGS/cubeDn · 9cc64e5b
  Kristin authored Jun 29, 2018
  9cc64e5b
- Merge branch 'cubeDn' of github.com:AgoinsUSGS/ISIS3 into bugginess · 478731b8
  Adam Goins authored Jun 29, 2018
  
  478731b8
- removed erroneous QAction · b667515c
  Adam Goins authored Jun 29, 2018
  
  b667515c
- Changed boost edge bundled property to work without c++11 in ControlNet. · bd748fff
  Jesse Mapel authored Jun 29, 2018
  
  bd748fff
- Merge pull request #299 from AgoinsUSGS/cleanup · 71590799
  Kristin authored Jun 29, 2018
  71590799
Jun 28, 2018
- Deleting commented out code · ceef89ad
  Makayla Shepherd authored Jun 28, 2018
  
  ceef89ad
- Deleted commented out code. · d2f74112
  Makayla Shepherd authored Jun 28, 2018
  
  d2f74112
- Added history entries · 7ef6176d
  Makayla Shepherd authored Jun 28, 2018
  
  7ef6176d