Commits · e6a23dfe42180808263356de170267f9471c8a1d · aflab / astrogeology / ISIS3 · GitLab

Jul 12, 2018
- Fixed history entries and removed unused member variable. · e6a23dfe
  Kaitlyn Lee authored Jul 12, 2018
  
  e6a23dfe
- Fixing history comments · d786e6ba
  Summer Stapleton authored Jul 12, 2018
  
  d786e6ba
- Fixed merge conflicts. · 51dc058a
  Tracie Sucharski authored Jul 12, 2018
  
  51dc058a
- PROG: Forgot qDebugs. · c6542113
  Tracie Sucharski authored Jul 12, 2018
  
  c6542113
- Merge branch 'ipceDocks' into ipceDocks · c84d3646
  Tracie Sucharski authored Jul 12, 2018
  
  c84d3646
- Fixed seg faults caused by changing an active control and discarding edits on... · 3688801e
  Tracie Sucharski authored Jul 12, 2018
  3688801e
- Merge pull request #343 from kdl222/sizePolicy · efe9fa1d
  Summer Stapleton authored Jul 12, 2018
  efe9fa1d
- Added comment. · e5ebc3be
  Kaitlyn Lee authored Jul 12, 2018
  
  e5ebc3be
- Added references comment. · 0507968b
  Kaitlyn Lee authored Jul 12, 2018
  
  0507968b
- Fixed history entry lengths. · e2d8329d
  Kaitlyn Lee authored Jul 12, 2018
  
  e2d8329d
- If an active control net is not set, the cnet tool will not be enabled. · 0efa71ce
  Kaitlyn Lee authored Jul 12, 2018
  
  0efa71ce
- Merge branch 'ipceDocks' of github.com:USGS-Astrogeology/ISIS3 into sizePolicy · 289dfaa8
  Kaitlyn Lee authored Jul 12, 2018
  
  289dfaa8
- Fixed merge conflicts. · b9b025a9
  Tracie Sucharski authored Jul 12, 2018
  
  b9b025a9
- Merge pull request #338 from TracieSucharski/ipceDocks · ba193d07
  Kristin authored Jul 11, 2018
  ba193d07
Jul 11, 2018
- Moved history entry. · 857fbefc
  Kaitlyn Lee authored Jul 11, 2018
  
  857fbefc
- Merge branch 'ipceDocks' of github.com:USGS-Astrogeology/ISIS3 into sizePolicy · 35e62b8c
  Kaitlyn Lee authored Jul 11, 2018
  
  35e62b8c
- Made some visual changes to ipce and fixed the problem of a project's size not... · a37f81fb
  Kaitlyn Lee authored Jul 11, 2018
  a37f81fb
- Merge branch 'ipceDocks' into ipceDocks · e150d935
  Tracie Sucharski authored Jul 11, 2018
  
  e150d935
- Merging dev into ipceDocks-fix merge conflicts. · 7be1a1dd
  Tracie Sucharski authored Jul 11, 2018
  
  7be1a1dd
- Fixed memory problems introduced from the ControlHealth branch. · 368bdcec
  Tracie Sucharski authored Jul 11, 2018
  
  368bdcec
- Merge pull request #339 from kdl222/qsettings · a77b761c
  Kristin authored Jul 11, 2018
  a77b761c
- Merge branch 'ipceDocks' into qsettings · 0af24e81
  Kristin authored Jul 11, 2018
  
  0af24e81
- Merge pull request #335 from SgStapleton/ipceDocksTemplates · b914aeea
  Kristin authored Jul 11, 2018
  b914aeea
- Merge branch 'ipceDocks' into ipceDocksTemplates · cba1cd78
  Kristin authored Jul 11, 2018
  
  cba1cd78
- Merge pull request #336 from kdl222/savePoint · 6d6b285d
  Kristin authored Jul 11, 2018
  6d6b285d
- Merge branch 'savePoint' of https://github.com/kdl222/ISIS3 into savePoint · b9b67080
  Kaitlyn Lee authored Jul 11, 2018
  
  b9b67080
- Fixed typo. · b738b490
  Kaitlyn Lee authored Jul 11, 2018
  
  b738b490
- Changes for review feedback · eaf99ee5
  Summer Stapleton authored Jul 11, 2018
  
  eaf99ee5
- Fixing merge conflicts · ae100d7e
  Summer Stapleton authored Jul 11, 2018
  
  ae100d7e
- Fixing merge conflicts · 23ba2548
  Summer Stapleton authored Jul 11, 2018
  
  23ba2548
- Merge branch 'ipceDocks' of https://github.com/TracieSucharski/ISIS3 into deleteme · 5faa6a26
  Kaitlyn Lee authored Jul 11, 2018
  
  5faa6a26
- Commenting-out line in ImportImagesWorkOrder.cpp to temporarily fix segfault of astrovm4 · 3270c0cb
  Summer Stapleton authored Jul 11, 2018
  
  3270c0cb
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into ipceDocks · 80eeabe2
  Kaitlyn Lee authored Jul 11, 2018
  
  80eeabe2
- Added a history entry and removed some code added from Tracie's changes. · 4b49e2dc
  Kaitlyn Lee authored Jul 11, 2018
  
  4b49e2dc
- Merge branch 'ipceDocks' into ipceDocksTemplates · ac3994b0
  Kristin authored Jul 11, 2018
  
  ac3994b0
- Changed vertical sizePolicy to Preferred. · 5571b947
  Tracie Sucharski authored Jul 11, 2018
  
  5571b947
Jul 10, 2018
- Merge branch 'ipceDocks' into savePoint · 4be2a7db
  Kaitlyn Lee authored Jul 10, 2018
  
  4be2a7db
- Merge pull request #334 from kdl222/tileViews · c48b8344
  Kristin authored Jul 10, 2018
  c48b8344
- Fixed merge conflicts (merging from Astro/IpceDocks into my clone. · e5809719
  Tracie Sucharski authored Jul 10, 2018
  
  e5809719
- Added Tracie's fix. · 0c85bbd3
  Kaitlyn Lee authored Jul 10, 2018
  
  0c85bbd3