Commits · 19b7384aed053f6f8b971a1bb2e8cb6a60ad1310 · aflab / astrogeology / ISIS3 · GitLab

Apr 17, 2018
- Merge remote-tracking branch 'upstream/dev' into ipce · 19b7384a
  Tracie Sucharski authored Apr 17, 2018
  
  19b7384a
- Merge pull request #140 from jcwbacker/m05369 · 459daad3
  Kristin authored Apr 16, 2018
  459daad3
Apr 16, 2018
- PROG: Backed out previous changes because the read/write control is needed for error checking. · 663173f0
  Tracie Sucharski authored Apr 16, 2018
  
  663173f0
- Update PvlTranslationTable.cpp · 65771df2
  jcwbacker authored Apr 16, 2018
  
  65771df2
- delete files, accidentally added. · e93eea03
  Jeannie Backer authored Apr 16, 2018
  
  e93eea03
- delete translaation file, accidentally added. · 3746f423
  Jeannie Backer authored Apr 16, 2018
  
  3746f423
- Fixed documentation and history entries. · d583e1ec
  Jeannie Backer authored Apr 16, 2018
  
  d583e1ec
- update from dev · 5afa2b43
  Jeannie Backer authored Apr 16, 2018
  
  5afa2b43
- Fixed bug in rosetta osiris ingestion app. · 321a5fff
  Jeannie Backer authored Apr 16, 2018
  
  321a5fff
- Merge pull request #139 from jessemapel/rosetta · 761b52a9
  Kristin authored Apr 16, 2018
  761b52a9
Apr 14, 2018
- Added subwindowing test for Rosetta OSIRIS cameras · d4e99968
  Jesse Mapel authored Apr 14, 2018
  
  d4e99968
Apr 13, 2018
- Merge pull request #136 from jessemapel/rosetta · ecc8c4e1
  Kristin authored Apr 13, 2018
  ecc8c4e1
- PROG: Forgot to remove qDebugs. · 43dade8e
  Tracie Sucharski authored Apr 13, 2018
  
  43dade8e
- PROG: In mouseButtonRelease method return if a control net has not been set. · b8fb59ec
  Tracie Sucharski authored Apr 13, 2018
  
  b8fb59ec
Apr 11, 2018
- Added history comment to Rosetta OSIRIS cameras. · ec74db4d
  Jesse Mapel authored Apr 11, 2018
  
  ec74db4d
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into rosetta · 4c43b092
  Jesse Mapel authored Apr 11, 2018
  
  4c43b092
- Fixed subwindowing in Rosetta OSIRIS cameras. · 59fc906a
  Jesse Mapel authored Apr 11, 2018
  
  59fc906a
- PROG: Added new view class for ipce. · c9516956
  Tracie Sucharski authored Apr 11, 2018
  
  c9516956
- Exiting will now save any edits to the active control net and when switching... · 2a88748b
  Tracie Sucharski authored Apr 11, 2018
  2a88748b
- PROG: Added new method to allow a non-WorkORder entry to be added to the history tree widget. · 8efb1ece
  Tracie Sucharski authored Apr 11, 2018
  
  8efb1ece
- PROG: Created the CnetEditorView class to hold the CnetEditorWidget. This... · 4893638e
  Tracie Sucharski authored Apr 11, 2018
  4893638e
- PROG: Clean up includes. · 87ef505e
  Tracie Sucharski authored Apr 11, 2018
  
  87ef505e
- PROG: If the control has been modified, saved to new project location. · 30af0e2d
  Tracie Sucharski authored Apr 11, 2018
  
  30af0e2d
- PROG: Created the ipce view to hold the CnetEditorWidget. · bd460f6b
  Tracie Sucharski authored Apr 11, 2018
  
  bd460f6b
- PROG: Moved xml serialization to newly created CnetEditorView. · d067c152
  Tracie Sucharski authored Apr 11, 2018
  
  d067c152
- PROG:Added removeView slot to remove a view, and check for modified active control. · e1a994bc
  Tracie Sucharski authored Apr 11, 2018
  
  e1a994bc
Apr 10, 2018
- Merge pull request #135 from kdl222/m05230 · 3b629e57
  Makayla Shepherd authored Apr 10, 2018
  3b629e57
- Merge pull request #127 from kdl222/m05372 · 57c82c40
  Makayla Shepherd authored Apr 10, 2018
  57c82c40
- Merge branch 'dev' into m05372 · 7cac4504
  Makayla Shepherd authored Apr 10, 2018
  
  7cac4504
- Merge pull request #133 from ihumphrey-usgs/dev · 91253e41
  Makayla Shepherd authored Apr 10, 2018
  91253e41
Apr 07, 2018
- update centos7 with srtp dependency and fedora25 with quadmath dependency · 9e344711
  Ian Humphrey authored Apr 03, 2018
  
  9e344711
Apr 06, 2018
- Removed lines added from the merge conflict. · 5474e098
  Kaitlyn Lee authored Apr 06, 2018
  
  5474e098
- Fixed conflicts with pull. · b2f82e50
  Kaitlyn Lee authored Apr 06, 2018
  
  b2f82e50
- Fixed @param inconsistencies · 4d5514fd
  Kaitlyn Lee authored Apr 06, 2018
  
  4d5514fd
- Fixed typo. · 66a8e185
  Kaitlyn Lee authored Apr 06, 2018
  
  66a8e185
- Merge pull request #76 from kdl222/m04923 · e700c2c8
  Makayla Shepherd authored Apr 06, 2018
  e700c2c8
- Merge pull request #130 from ihumphrey-usgs/dev · 99a18e43
  Makayla Shepherd authored Apr 06, 2018
  99a18e43
- PROG updated install guide for fedora 25 · a56b432f
  Ian Humphrey authored Apr 06, 2018
  
  a56b432f
- Merge pull request #129 from ihumphrey-usgs/dev · 1c1366b9
  Makayla Shepherd authored Apr 06, 2018
  1c1366b9
- Update InstallGuide for Fedora25. · 993d07d2
  Ian Humphrey authored Apr 06, 2018
  
  993d07d2