Commits · b9b025a9fba296c9f14271a8d8ab07c7f0cec539 · aflab / astrogeology / ISIS3 · GitLab

Jul 12, 2018
- Fixed merge conflicts. · b9b025a9
  Tracie Sucharski authored Jul 12, 2018
  
  b9b025a9
Jul 11, 2018
- 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
- 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
- Making a few small changes based on self-review of new PR · 653d5964
  Summer Stapleton authored Jul 10, 2018
  
  653d5964
- Set up sizePolicy and sizeHint in the AbstractProjectItemView, removing from... · fb30d755
  Tracie Sucharski authored Jul 10, 2018
  fb30d755
- Making a few mild modifications based on testing feedback · b14d8dcf
  Summer Stapleton authored Jul 10, 2018
  
  b14d8dcf
- Added history entry. · d83e84b3
  Kaitlyn Lee authored Jul 10, 2018
  
  d83e84b3
- Fixes warning/history tabs being misplaced. · 697b3a63
  Kaitlyn Lee authored Jul 10, 2018
  
  697b3a63
Jul 09, 2018
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into ipceDocks · 8c2a8ddd
  Kaitlyn Lee authored Jul 09, 2018
  
  8c2a8ddd
- Changed removeView() to delete the dock widget uncommented code that closes... · 0cea60ce
  Kaitlyn Lee authored Jul 09, 2018
  0cea60ce
- Merge pull request #327 from USGS-Astrogeology/ipce · af857368
  Kristin authored Jul 09, 2018
  af857368
Jul 07, 2018
- Merging the ipceDocks branch into this branch · 8d5a2496
  Summer Stapleton authored Jul 07, 2018
  
  8d5a2496
- Adding history comments and removing outdated workorder files · dd3cf25c
  Summer Stapleton authored Jul 07, 2018
  
  dd3cf25c
- Completed separating templates into map templates and registration templates.... · 0d3fe044
  Summer Stapleton authored Jul 07, 2018
  0d3fe044
- Merge pull request #329 from kdl222/shortcuts · a80cd0be
  Summer Stapleton authored Jul 07, 2018
  a80cd0be
Jul 06, 2018
- Reverted changes tp QIsisApplication. · 4a74e06a
  Kaitlyn Lee authored Jul 06, 2018
  
  4a74e06a
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into shortcuts · 35b4ee65
  Kaitlyn Lee authored Jul 06, 2018
  
  35b4ee65
- Cleaned up some leftover code. · 542a11c6
  Kaitlyn Lee authored Jul 06, 2018
  
  542a11c6
- Fixed comment in cubednview. · d12997ea
  Kaitlyn Lee authored Jul 06, 2018
  
  d12997ea
- Reworded comments. · 4f598639
  Kaitlyn Lee authored Jul 06, 2018
  
  4f598639