Commits · 84dc94b891f26a506885c45066190585d8121346 · aflab / astrogeology / ISIS3 · GitLab

Jul 02, 2018
- Merge branch 'ipceDocks' of github.com:USGS-Astrogeology/ISIS3 into iDTemplates · 84dc94b8
  Summer Stapleton authored Jul 02, 2018
  
  84dc94b8
Jul 01, 2018
- Merge pull request #255 from makaylas/ipceDocks · 5dd4f0e7
  Kristin authored Jul 01, 2018
  5dd4f0e7
- Merge branch 'ipceDocks' into ipceDocks · 6e1d727a
  Makayla Shepherd authored Jul 01, 2018
  
  6e1d727a
- Merge pull request #263 from SgStapleton/ipceDocksWindowChange · 0044412c
  Makayla Shepherd authored Jul 01, 2018
  0044412c
Jun 30, 2018
- The bulk of the template changes implementation. ControlPointEditWidget fully... · 879ca3a6
  Summer Stapleton authored Jun 30, 2018
  879ca3a6
- Fixed method header comment · 3d3a14fd
  Makayla Shepherd authored Jun 30, 2018
  
  3d3a14fd
- Deleted a double declaration of a method · 4c52ba1a
  Makayla Shepherd authored Jun 30, 2018
  
  4c52ba1a
- Merge pull request #306 from makaylas/ipceProgress · 0a1da587
  ihumphrey authored Jun 30, 2018
  0a1da587
- Made changes based on PR comments · 94604724
  Makayla Shepherd authored Jun 30, 2018
  
  94604724
Jun 28, 2018
- Merging ipceDocks into my changes · 783a0a68
  Summer Stapleton authored Jun 28, 2018
  
  783a0a68
- Added saveAs functionality for templates in TemplateEditorWidget · f0a94360
  Summer Stapleton authored Jun 28, 2018
  
  f0a94360
- Deleting commented out code · ceef89ad
  Makayla Shepherd authored Jun 28, 2018
  
  ceef89ad
- Deleted commented out code. · d2f74112
  Makayla Shepherd authored Jun 28, 2018
  
  d2f74112
- Added history entries · 7ef6176d
  Makayla Shepherd authored Jun 28, 2018
  
  7ef6176d
Jun 26, 2018
- Deleted the progress bar clean up in WorkOrder because the HistoryTreeWidget... · 222ef0a0
  Makayla Shepherd authored Jun 26, 2018
  222ef0a0
Jun 23, 2018
- Removed commented out code · 538c2ba9
  Makayla Shepherd authored Jun 23, 2018
  
  538c2ba9
- Merge conflicts · dbc55bdd
  Makayla Shepherd authored Jun 23, 2018
  
  dbc55bdd
- Merge conflicts · 19fc8304
  Makayla Shepherd authored Jun 23, 2018
  
  19fc8304
- Fixing merge commits · e1be3e8b
  Makayla Shepherd authored Jun 23, 2018
  
  e1be3e8b
- Merge pull request #279 from TracieSucharski/ipceDocks · 4ddc8311
  kledmundson authored Jun 22, 2018
  4ddc8311
- Merge branch 'ipceDocks' into ipceDocks · b748ca74
  Tracie Sucharski authored Jun 22, 2018
  
  b748ca74
- Merge branch 'ipceDocks' into ipceDocks · b5cda25e
  Makayla Shepherd authored Jun 22, 2018
  
  b5cda25e
Jun 22, 2018
- Forgot to remove qDebug. · 5508db69
  Tracie Sucharski authored Jun 22, 2018
  
  5508db69
- Fixed problem with save project button enabled on ipce open without project... · 21b1ee9c
  Tracie Sucharski authored Jun 22, 2018
  21b1ee9c
- Merge branch 'ipceCnetHealth' into ipceDocks · 7baff3e1
  Kristin authored Jun 22, 2018
  
  7baff3e1
- Resolve merge conflicts · f9120520
  Kristin Berry authored Jun 22, 2018
  
  f9120520
Jun 21, 2018
- Merge pull request #272 from jessemapel/ipce · 92ba0301
  Kristin authored Jun 21, 2018
  92ba0301
- Added history for pointIgnored and pointUnIgnored in ControlNet and ControlPoint. · 0f19ed1d
  Jesse Mapel authored Jun 21, 2018
  
  0f19ed1d
- Fixed control point ignoring and unignored in ControlNet · 565557c2
  Jesse Mapel authored Jun 21, 2018
  
  565557c2
- Merge pull request #269 from jessemapel/ipce · 670f49ff
  Kristin authored Jun 21, 2018
  670f49ff
- Cleaned up QChart includes · d2070657
  Jesse Mapel authored Jun 21, 2018
  
  d2070657
- Merge pull request #232 from AgoinsUSGS/Signals_Slots · 5669639e
  Jesse Mapel authored Jun 21, 2018
  5669639e
- Merge pull request #266 from USGS-Astrogeology/ipceCnetHealth · 58f83821
  Kristin authored Jun 21, 2018
  58f83821
- Merge pull request #268 from jessemapel/ipceCnetHealth · bbbf65bd
  Kristin authored Jun 21, 2018
  bbbf65bd
- Clean up in ControlNet · 6939e36f
  Jesse Mapel authored Jun 21, 2018
  
  6939e36f
- Fixed merge conflict · bf7e049b
  Makayla Shepherd authored Jun 20, 2018
  
  bf7e049b
Jun 20, 2018
- Fixed things that were broken by the merge · fd2e7cba
  Makayla Shepherd authored Jun 20, 2018
  
  fd2e7cba
- Merge pull request #267 from jessemapel/ipceCnetHealth · 5bc9b6b0
  Kristin authored Jun 20, 2018
  5bc9b6b0
- Merge branch 'ipceCnetHealth' of github.com:USGS-Astrogeology/ISIS3 into ipceCnetHealth · 0629feae
  Jesse Mapel authored Jun 20, 2018
  
  0629feae
- Removed QtCharts references · a19e69c5
  Jesse Mapel authored Jun 20, 2018
  
  a19e69c5