Commits · af674ee4be4ab9a3ec837d75dda22011d5ecb183 · aflab / astrogeology / ISIS3 · GitLab

Apr 13, 2018
- Whitespace Merge conflict · af674ee4
  chrisryancombs authored Apr 13, 2018
  
  af674ee4
- Merge pull request #136 from jessemapel/rosetta · ecc8c4e1
  Kristin authored Apr 13, 2018
  ecc8c4e1
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
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 09, 2018
- Merge pull request #132 from Kelvinrr/cmake · 3c813321
  jlaura authored Apr 09, 2018
  3c813321
Apr 07, 2018
- update centos7 with srtp dependency and fedora25 with quadmath dependency · 9e344711
  Ian Humphrey authored Apr 03, 2018
  
  9e344711
- removed some dependencies of dependencies · ae1d5aa0
  Kelvin Rodriguez authored Apr 07, 2018
  
  ae1d5aa0
- added python 3.6 to env file · 1e4a9fbd
  Kelvin Rodriguez authored Apr 06, 2018
  
  1e4a9fbd
- removed calls to run finalizeInstalledOsxRpaths.py · b43a0063
  Kelvin Rodriguez authored Apr 06, 2018
  
  b43a0063
Apr 06, 2018
- Removed lines added from the merge conflict. · 5474e098
  Kaitlyn Lee authored Apr 06, 2018
  
  5474e098
- Added line back in that caused install errors · 51ccc893
  Kelvin Rodriguez authored Apr 06, 2018
  
  51ccc893
- 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
- PROG: Updated Isis version to reflect a new development version after the release of isis3.5.2 · 9be9ca3b
  Ian Humphrey authored Apr 06, 2018
  
  9be9ca3b
- Updated method documentation to make sure it was consistent and added history entry. · 1a09013a
  Kaitlyn Lee authored Apr 06, 2018
  
  1a09013a
Apr 04, 2018
- Reworded added info about shells. · 424c6438
  Kaitlyn Lee authored Apr 04, 2018
  
  424c6438
- Merge pull request #126 from USGS-Astrogeology/revert-125-revert-120-cmake · ae6ae322
  jlaura authored Apr 04, 2018
  ae6ae322
- Revert "Revert "Adding support for libisis python bindings"" · b47ae312
  jlaura authored Apr 04, 2018
  
  b47ae312
- Merge pull request #125 from USGS-Astrogeology/revert-120-cmake · c3d98581
  jlaura authored Apr 04, 2018
  c3d98581
- Revert "Adding support for libisis python bindings" · 34d99c7f
  jlaura authored Apr 04, 2018
  
  34d99c7f
Apr 02, 2018
- Merge pull request #120 from Kelvinrr/cmake · 820ca9bd
  jlaura authored Apr 02, 2018
  820ca9bd
- Merge pull request #123 from jessemapel/pcnaifid · 81dad0cf
  Kristin authored Apr 02, 2018
  81dad0cf
Mar 31, 2018
- updated env for linux, bullet libs sorted out · 1c7ea0a9
  Kelvinrr authored Mar 30, 2018
  
  1c7ea0a9
Mar 30, 2018
- updated env · f0fa3fcb
  Kelvin Rodriguez authored Mar 30, 2018
  
  f0fa3fcb
- typo: FindSIP -> FindSip · bd30d5db
  Kelvin Rodriguez authored Mar 30, 2018
  
  bd30d5db
- updated env.yml · 96095768
  Kelvin Rodriguez authored Mar 30, 2018
  
  96095768
- totally don't remember what I changed · 41381caa
  Kelvin Rodriguez authored Mar 29, 2018
  
  41381caa
Mar 29, 2018
- mac env is now py3 · 948c7e3f
  Kelvin Rodriguez authored Mar 29, 2018
  
  948c7e3f
- changed module to make isispy importable · 578bcfa2
  Kelvin Rodriguez authored Mar 29, 2018
  
  578bcfa2