Commits · fd2e7cbabb555ff8eff5b90aa2205e0085532725 · aflab / astrogeology / ISIS3 · GitLab

Jun 20, 2018
- Fixed things that were broken by the merge · fd2e7cba
  Makayla Shepherd authored Jun 20, 2018
  
  fd2e7cba
Jun 19, 2018
- Forgot to copy over OpenProjectWorkOrder · 25dbe95b
  Makayla Shepherd authored Jun 19, 2018
  
  25dbe95b
- 1. QSettings now saves to the project directory if the user saves the project.... · cfe3d265
  Makayla Shepherd authored Jun 19, 2018
  cfe3d265
Jun 18, 2018
- Merge pull request #259 from SgStapleton/ipceDocksWindowChange · c727e361
  Tracie Sucharski authored Jun 18, 2018
  c727e361
- Merge branch 'ipceDocks' into ipceDocksWindowChange · f9889ee9
  Tracie Sucharski authored Jun 18, 2018
  
  f9889ee9
- Adding specific history comments since resolving a redmine ticket · 11ac77c4
  Summer Stapleton authored Jun 18, 2018
  
  11ac77c4
- Merge pull request #240 from kdl222/cleanupDocks · 339391c1
  Makayla Shepherd authored Jun 18, 2018
  339391c1
- Removing debug statements · 91e82078
  Summer Stapleton authored Jun 18, 2018
  
  91e82078
- Merge branch 'ipceDocks' into cleanupDocks · dc9ab6a9
  Kaitlyn Lee authored Jun 18, 2018
  
  dc9ab6a9
- Reworded comments for clarification. · 97aa82b0
  Kaitlyn Lee authored Jun 18, 2018
  
  97aa82b0
- Merge pull request #239 from kdl222/ipceTools · 1001bc94
  Makayla Shepherd authored Jun 18, 2018
  1001bc94
Jun 16, 2018
- Merge branch 'ipceTools' of https://github.com/kdl222/ISIS3 into ipceTools · 77bf4b73
  Kaitlyn Lee authored Jun 16, 2018
  
  77bf4b73
- Removed unused includes. · fedccfdd
  Kaitlyn Lee authored Jun 16, 2018
  
  fedccfdd
- Merge branch 'ipceDocks' into ipceTools · 4752a35c
  Kaitlyn Lee authored Jun 16, 2018
  
  4752a35c
- Merge branch 'ipceDocks' of github.com:USGS-Astrogeology/ISIS3 into ipceDocksWindowChange · dc498ae7
  Summer Stapleton authored Jun 15, 2018
  
  dc498ae7
- Changed history entry. · fd876827
  Kaitlyn Lee authored Jun 15, 2018
  
  fd876827
- Merge branch 'cleanupDocks' of https://github.com/kdl222/ISIS3 into cleanupDocks · 3d9aaafd
  Kaitlyn Lee authored Jun 15, 2018
  
  3d9aaafd
Jun 15, 2018
- Removed unused methods. · 006c2bb0
  Kaitlyn Lee authored Jun 15, 2018
  
  006c2bb0
- Cleaned up ControlPointEditView. · 3dbfcb9d
  Kaitlyn Lee authored Jun 15, 2018
  
  3dbfcb9d
- Merge branch 'ipceDocks' into cleanupDocks · 1207b05c
  Kaitlyn Lee authored Jun 15, 2018
  
  1207b05c
- Removed redundant if statement. · dead214d
  Kaitlyn Lee authored Jun 15, 2018
  
  dead214d
- Merge pull request #242 from TracieSucharski/ipceDocks · c1959fea
  kledmundson authored Jun 15, 2018
  c1959fea
- Forgot to remove qdebugs. · e081211a
  Tracie Sucharski authored Jun 15, 2018
  
  e081211a
- Fixed recent projects. The readSettings must be called before... · 36f2e413
  Tracie Sucharski authored Jun 15, 2018
  36f2e413
- Renamed sorting dialog and removed commented code. · 657db49b
  Kaitlyn Lee authored Jun 15, 2018
  
  657db49b
Jun 14, 2018
- Fixing merge conflicts. · 2f79a226
  Kaitlyn Lee authored Jun 14, 2018
  
  2f79a226
- Made some quick edits · 55994dd4
  Kaitlyn Lee authored Jun 14, 2018
  
  55994dd4
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into ipceTools · b4e97615
  Kaitlyn Lee authored Jun 14, 2018
  
  b4e97615
- Reformatted code. · 195e4b57
  Kaitlyn Lee authored Jun 14, 2018
  
  195e4b57
- Removed unused methods. · 78e9df6a
  Kaitlyn Lee authored Jun 14, 2018
  
  78e9df6a
- Merge branch 'ipceDocks' of https://github.com/USGS-Astrogeology/ISIS3 into cleanupDocks · 984af3fc
  Kaitlyn Lee authored Jun 14, 2018
  
  984af3fc
- Added fixes to comment. · bc016b90
  Kaitlyn Lee authored Jun 14, 2018
  
  bc016b90
- Merge branch 'ipceDocks' into ipceTools · f6277155
  Kaitlyn Lee authored Jun 14, 2018
  
  f6277155
- Removed tooltip. · 97b6606b
  Kaitlyn Lee authored Jun 14, 2018
  
  97b6606b
- Removed the save active control button. · f6cf7566
  Kaitlyn Lee authored Jun 14, 2018
  
  f6cf7566
- Made loadNetwork() a private slot. · a90e20c7
  Kaitlyn Lee authored Jun 14, 2018
  
  a90e20c7
- Commented out code that loads a network for now. · d3761466
  Kaitlyn Lee authored Jun 14, 2018
  
  d3761466
- Moved signals to Footprint2DView and CubeDnView. · b7ff7a2b
  Kaitlyn Lee authored Jun 14, 2018
  
  b7ff7a2b
- Cleaned up Footprint view. · 7fdf1ab9
  Kaitlyn Lee authored Jun 14, 2018
  
  7fdf1ab9
- Removed toolPadActions(). · b8b43a49
  Kaitlyn Lee authored Jun 14, 2018
  
  b8b43a49