Commits · 2d76b7da59906006a3c4ec2a5b1d85c1085d08f1 · aflab / astrogeology / ISIS3 · GitLab

Aug 10, 2018
- Merge pull request #369 from twilson271828/dev · 2d76b7da
  ihumphrey authored Aug 10, 2018
  2d76b7da
Aug 08, 2018
- Merge pull request #392 from USGS-Astrogeology/ipce · c13ad95c
  kledmundson authored Aug 08, 2018
  c13ad95c
- Update Camera.h · 8999d63e
  kledmundson authored Aug 08, 2018
  
  8999d63e
- Merge pull request #395 from TracieSucharski/ipce · e978ab00
  kledmundson authored Aug 08, 2018
  e978ab00
- Update Directory.h · 645db323
  kledmundson authored Aug 08, 2018
  
  645db323
- Remove the autosave of the active control which was done as a temporary fix... · d7b1b4b1
  Tracie Sucharski authored Aug 08, 2018
  d7b1b4b1
Aug 03, 2018
- Fix merge conflicts. · 3783c20c
  Tracie Sucharski authored Aug 03, 2018
  
  3783c20c
Aug 01, 2018
- Merge pull request #390 from kdl222/ipceDocks · edc8030e
  Tracie Sucharski authored Aug 01, 2018
  edc8030e
- Merge pull request #363 from kdl222/tabAndTile · 56a34dd3
  Tracie Sucharski authored Aug 01, 2018
  56a34dd3
- Merge branch 'ipce' into tabAndTile · 54d4d105
  Tracie Sucharski authored Aug 01, 2018
  
  54d4d105
- Merge branch 'ipce' of github.com:USGS-Astrogeology/ISIS3 into ipceDocks · 5f9daf4a
  Kaitlyn Lee authored Aug 01, 2018
  
  5f9daf4a
Jul 31, 2018
- Moved Doxygen tags for XMLHandler outside of the class declaration, to keep... · 3c4a6d3a
  Tyler Wilson authored Jul 31, 2018
  3c4a6d3a
- Merge branch 'dev' of github.com:twilson271828/ISIS3 into dev · fc0b871e
  Tyler Wilson authored Jul 31, 2018
  
  fc0b871e
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev · 20b40ac2
  Tyler Wilson authored Jul 31, 2018
  
  20b40ac2
- Merge pull request #382 from kberryUSGS/qnet_fix · bde69f8b
  Jesse Mapel authored Jul 31, 2018
  bde69f8b
- Merge pull request #387 from TracieSucharski/ipce · 78e50324
  kledmundson authored Jul 31, 2018
  78e50324
- Committed wrong version-experimental docking on Left instead of right. · 7d738971
  Tracie Sucharski authored Jul 31, 2018
  
  7d738971
Jul 30, 2018
- Merge pull request #380 from TracieSucharski/ipce · 76b24076
  kledmundson authored Jul 30, 2018
  76b24076
- Prog: Problem with last commit. · 4636d350
  Tracie Sucharski authored Jul 30, 2018
  
  4636d350
- Merge branch 'ipce' of github.com:TracieSucharski/ISIS3 into ipce · 831dabb9
  Tracie Sucharski authored Jul 30, 2018
  
  831dabb9
- Set background of centralWidget to a pattern to distinguish it from dockable areas. · 75fe2544
  Tracie Sucharski authored Jul 30, 2018
  
  75fe2544
- Delete ProjectItemImageProxyModel.h · 7c4a80e5
  Tyler Wilson authored Jul 30, 2018
  
  7c4a80e5
- Delete ProjectItemImageProxyModel.cpp · b577caa9
  Tyler Wilson authored Jul 30, 2018
  
  b577caa9
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev · 55399828
  Tyler Wilson authored Jul 30, 2018
  
  55399828
Jul 28, 2018
- And updated other.m_vertexMap · 64c94e18
  Kristin Berry authored Jul 27, 2018
  
  64c94e18
- Update IpceMainWindow.cpp · dd84add9
  Tracie Sucharski authored Jul 27, 2018
  
  dd84add9
- Update IpceMainWindow.cpp · f8a1286c
  Tracie Sucharski authored Jul 27, 2018
  
  f8a1286c
- Removed unused experimental code. · ba6c89aa
  Tracie Sucharski authored Jul 27, 2018
  
  ba6c89aa
- Moved code for m_vertexMap into the actual swap function · 7819e870
  Kristin Berry authored Jul 27, 2018
  
  7819e870
Jul 26, 2018
- Fix merge conflicts in History entry of TemplateList.h · 404f57cd
  Tracie Sucharski authored Jul 26, 2018
  
  404f57cd
- Wrong version of file commited. · 107f66be
  Tracie Sucharski authored Jul 26, 2018
  
  107f66be
- Fix sizing issues with views so that they dock nicely with the other views.... · 175fad37
  Tracie Sucharski authored Jul 26, 2018
  175fad37
- Correctly update vertex descriptors in the m_vertexMap hash when copying and swapping a control net · 0d2f236d
  Kristin Berry authored Jul 26, 2018
  
  0d2f236d
Jul 25, 2018
- Merge branch 'ipceBundleWindow' of github.com:USGS-Astrogeology/ISIS3 into dev · 4cec39df
  Tyler Wilson authored Jul 25, 2018
  
  4cec39df
Jul 23, 2018
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev · 59b0bda3
  Tyler Wilson authored Jul 23, 2018
  
  59b0bda3
- Updated ControlNet::swap() to swap the new graph structure. Fixes problem with... · 99b75a03
  Kristin Berry authored Jul 23, 2018
  99b75a03
- Merge pull request #121 from USGS-Astrogeology/contributers · d02a0e04
  Stuart Sides authored Jul 23, 2018
  d02a0e04
Jul 20, 2018
- Undoing previous changes to SpecialPixel.h · 3ab2ff42
  Tyler Wilson authored Jul 20, 2018
  
  3ab2ff42
- A few minor tweaks to documentation tags which were causing PHP warnings in... · b568ac9f
  Tyler Wilson authored Jul 20, 2018
  b568ac9f
- Merge branch 'dev' of github.com:twilson271828/ISIS3 into dev · 41fcd41c
  Tyler Wilson authored Jul 20, 2018
  
  41fcd41c