Commits · 93d0ac4f04bb8437e9a9e735c46383efad07c418 · aflab / astrogeology / ISIS3 · GitLab

Jun 29, 2018
- Merge pull request #310 from jessemapel/ipce · 93d0ac4f
  Kristin authored Jun 29, 2018
  93d0ac4f
- Fixed changes in ControlPointEditWidget that caused seg faults. · bb5d7636
  Jesse Mapel authored Jun 29, 2018
  
  bb5d7636
- Merge pull request #308 from jessemapel/ipce · 58e7d8f4
  AgoinsUSGS authored Jun 29, 2018
  58e7d8f4
- Changed boost edge bundled property to work without c++11 in ControlNet. · bd748fff
  Jesse Mapel authored Jun 29, 2018
  
  bd748fff
Jun 26, 2018
- Merge pull request #294 from jessemapel/signals · b061755e
  Kristin authored Jun 26, 2018
  b061755e
- fixed variable name error in ControlNet · 02ae0cba
  Jesse Mapel authored Jun 26, 2018
  
  02ae0cba
- Fixed adding edges in ControlNet · 90e3846d
  Jesse Mapel authored Jun 26, 2018
  
  90e3846d
- Merge pull request #293 from jessemapel/signals · 0e132c14
  Kristin authored Jun 26, 2018
  0e132c14
- Merge pull request #292 from jessemapel/ipce · d527f232
  Kristin authored Jun 26, 2018
  d527f232
- Added graph modified signal to pointIgnored and pointUnIgnored · 55cdd2f4
  Jesse Mapel authored Jun 26, 2018
  
  55cdd2f4
- Merge branch 'ipce' of github.com:USGS-Astrogeology/ISIS3 into ipce · 99ccd669
  Jesse Mapel authored Jun 26, 2018
  
  99ccd669
- Fixed cnetwinnow errors · 5c810c49
  Jesse Mapel authored Jun 26, 2018
  
  5c810c49
Jun 25, 2018
- Merge pull request #283 from jessemapel/ipce · 1601bd16
  Kristin authored Jun 25, 2018
  1601bd16
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into ipce_dev · 9038954a
  Jesse Mapel authored Jun 25, 2018
  
  9038954a
- Fixed signals in ControlNet · 98f0edb8
  Jesse Mapel authored Jun 25, 2018
  
  98f0edb8
Jun 22, 2018
- Merge pull request #277 from kdl222/m0703 · c7b5d380
  Kristin authored Jun 22, 2018
  c7b5d380
- Fixed Prog26 errors. · 0686b054
  Kaitlyn Lee authored Jun 22, 2018
  
  0686b054
- Made some changes to clarify exactly what happens if the ddd file has an old header format. · 01cffb75
  Kaitlyn Lee authored Jun 22, 2018
  
  01cffb75
- Merge pull request #274 from USGS-Astrogeology/ipceCnetHealth · 706afaf5
  AgoinsUSGS authored Jun 22, 2018
  706afaf5
- Resolve merge conflicts · f9120520
  Kristin Berry authored Jun 22, 2018
  
  f9120520
- Merge pull request #254 from makaylas/ipce · 93645897
  Kristin authored Jun 22, 2018
  93645897
- Merge pull request #271 from kdl222/m0703 · 8a508cb4
  Kristin authored Jun 22, 2018
  8a508cb4
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
- Updated test to remove path of the input files. · bf12d998
  Kaitlyn Lee authored Jun 21, 2018
  
  bf12d998
- 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 #244 from kdl222/m0703 · a9f6d788
  Makayla Shepherd authored Jun 21, 2018
  a9f6d788
- Merge pull request #256 from kdl222/m05188 · 2730619b
  Makayla Shepherd authored Jun 21, 2018
  2730619b
- 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
Jun 20, 2018
- 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
- Fixed merge conflicts · d8b6ebac
  Adam Goins authored Jun 20, 2018
  
  d8b6ebac
- Fixed merge conflicts · 088b404a
  Adam Goins authored Jun 20, 2018
  
  088b404a
- Fixed merge conflicts · 3b0e0c04
  Adam Goins authored Jun 20, 2018
  
  3b0e0c04