Commits · 4146d81daabd8cd7c99d3d5771dd930b709798f9 · aflab / astrogeology / ISIS3 · GitLab

Jan 26, 2018
- Resolved spiceit/dev merge conflict. · 4146d81d
  Tyler Wilson authored Jan 26, 2018
  
  4146d81d
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev · aca22153
  Tyler Wilson authored Jan 26, 2018
  
  aca22153
- Merge pull request #12 from SgStapleton/4736 · 5369faa9
  Christopher Ryan Combs Jr authored Jan 26, 2018
  5369faa9
- Merge pull request #6 from SgStapleton/m05145 · 624f929d
  Christopher Ryan Combs Jr authored Jan 26, 2018
  624f929d
- Merge pull request #5 from SgStapleton/m05218 · 74c18d47
  Christopher Ryan Combs Jr authored Jan 26, 2018
  74c18d47
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into m04736 · b6cad763
  Summer Stapleton authored Jan 26, 2018
  
  b6cad763
Jan 25, 2018
- Added ReleaseNotes directory inside... · bcffd0e1
  Tyler Wilson authored Jan 25, 2018
  bcffd0e1
- Merge pull request #10 from ihumphrey-usgs/jigsaw-errors-prog26 · 1dded5b3
  Makayla Shepherd authored Jan 25, 2018
  1dded5b3
- Merge pull request #9 from ihumphrey-usgs/fix-ProcessImport-imgs · 4c3e60bc
  Makayla Shepherd authored Jan 25, 2018
  4c3e60bc
- PROG replaced -i flag for sed for jigsaw errors test (macOS sed doesn't support this) · 577af224
  Ian Humphrey authored Jan 25, 2018
  
  577af224
- PROG update ProcessImportVicar img file to testData area · 21ae836d
  Ian Humphrey authored Jan 25, 2018
  
  21ae836d
- PROG updated ProcessImportPds img file to testData area · c8d7ad8d
  Ian Humphrey authored Jan 25, 2018
  
  c8d7ad8d
- Merge pull request #3 from jessemapel/dev · efb1c186
  Kristin authored Jan 25, 2018
  efb1c186
- PROG fixed ProcessImportVicar unitTest by relocating img file to base/testData/ProcessImportVicar · 3500aed1
  Ian Humphrey authored Jan 25, 2018
  
  3500aed1
- PROG fixed ProcessImportPds unitTest by relocating img file to base/testData/ProcessImportPds · 23daa446
  Ian Humphrey authored Jan 25, 2018
  
  23daa446
- Merged from dev · 500e7fc2
  Summer Stapleton authored Jan 24, 2018
  
  500e7fc2
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into 5145 · 9f852952
  Summer Stapleton authored Jan 24, 2018
  
  9f852952
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into m05218 · e2e416f8
  Summer Stapleton authored Jan 24, 2018
  
  e2e416f8
- Updated name for Chandrayaan mission that somehow got missed in merge · 1c10d7fc
  Summer Stapleton authored Jan 24, 2018
  
  1c10d7fc
- Merge pull request #4 from ihumphrey-usgs/revert-gui · 7081aa2a
  Makayla Shepherd authored Jan 24, 2018
  7081aa2a
- Revert "Revert "Revert "Addressed memory leak in Gui.cpp involving X-forwarding. Fixes #4736""" · a0057db8
  Ian Humphrey authored Jan 24, 2018
  a0057db8
- Merged from dev · 9c1bbb31
  Summer Stapleton authored Jan 24, 2018
  
  9c1bbb31
Jan 24, 2018
- Updated error message is Cube::create() to address when IsisPreferences cannot... · eb48387c
  Summer Stapleton authored Jan 09, 2018
  eb48387c
- Revert "Fixed ProcessImportPds to fix build. References #4883" · caf04192
  Summer Stapleton authored Jan 08, 2018
  caf04192
- Fixed ProcessImportPds to fix build. References #4883 · 5707ad2f
  Summer Stapleton authored Dec 28, 2017
  
  5707ad2f
- Fixing typo in last commit for InstallGuide · f5d580fe
  Summer Stapleton authored Jan 09, 2018
  
  f5d580fe
- Updated InstallGuide to include newer missions and to give better warning in... · 9e79f360
  Summer Stapleton authored Jan 09, 2018
  9e79f360
- Updated handling of memory leak in Gui.cpp to fix pull request. References #4736 · dfdb268e
  Summer Stapleton authored Jan 10, 2018
  
  dfdb268e
- Fixed build warnings in ControlNetVersioner · 6a40c88e
  Jesse Mapel authored Jan 24, 2018
  
  6a40c88e
Jan 23, 2018
- Modified README to remove government shutdown message · b4877f55
  Makayla Shepherd authored Jan 23, 2018
  
  b4877f55
- Fixed merge issues with re-migration · 3e763c06
  Makayla Shepherd authored Jan 23, 2018
  
  3e763c06
- Cleaned up the code, cleaned up the directories and added documentation to spiceinit.xml · 1e54977a
  Summer Stapleton authored Jan 12, 2018
  
  1e54977a
- Adding changes made by Cole to handle errors passed by json · 5a7c026f
  Summer Stapleton authored Jan 08, 2018
  
  5a7c026f
- Removed .log file from SpiceClient.cpp · c0dabbf4
  Summer Stapleton authored Jan 07, 2018
  
  c0dabbf4
- Added functionality for ApplicationLog · b86ebdd0
  Summer Stapleton authored Jan 07, 2018
  
  b86ebdd0
- Added NAIF Keywords functionality · cb182b2e
  Summer Stapleton authored Jan 07, 2018
  
  cb182b2e
- Cleaned up the code a bit · f5b19539
  Summer Stapleton authored Jan 07, 2018
  
  f5b19539
- TGIF! (In other words, got it working! · 8dc3265f
  Summer Stapleton authored Jan 05, 2018
  
  8dc3265f
- Trying to figure out getting the Json back · ce7333dc
  Summer Stapleton authored Jan 03, 2018
  
  ce7333dc
- Removed a bunch of qDebug() statements. · cc0afc7c
  Tyler Wilson authored Jan 02, 2018
  
  cc0afc7c