Commits · f249c0676d03e547dd48e3b4287265e80e32cc9a · aflab / astrogeology / Asc Geostac

Browse files

Feb 10, 2020
- Merge pull request #29 from jkaufy/master · f249c067
  Jacob Kaufman authored Feb 10, 2020
  f249c067
- Should be good to merge now · aa91e657
  Jacob Kaufman authored Feb 10, 2020
  
  aa91e657
- Fetch · b04cdd44
  Jacob Kaufman authored Feb 10, 2020
  
  b04cdd44
- Merge remote-tracking branch 'upstream/master' · 1abe0baa
  Jacob Kaufman authored Feb 10, 2020
  
  1abe0baa
- deleting so that i can merge lol · b535a27e
  Jacob Kaufman authored Feb 10, 2020
  b535a27e
- Merge branch 'master' of https://github.com/jkaufy/CartoCosmos-1 · 218fd542
  Jacob Kaufman authored Feb 10, 2020
  
  218fd542
- Merge pull request #34 from scottaames/master · 0797a643
  Scott Ames authored Feb 10, 2020
  0797a643
- Minor GUi changes · babb9fa7
  Scott Ames authored Feb 10, 2020
  
  babb9fa7
- Updating Jupyter Files · 86ff972f
  Jacob Kaufman authored Feb 10, 2020
  
  86ff972f
- Delete CartoCosmos.py · 185d5ef1
  Jacob Kaufman authored Feb 10, 2020
  
  185d5ef1
- Delete .DS_Store · 3a811315
  Jacob Kaufman authored Feb 10, 2020
  
  3a811315
- Updating Example · cec4e299
  Jacob Kaufman authored Feb 10, 2020
  
  cec4e299
- updated python naming conventions · 302018e0
  Jacob Kaufman authored Feb 10, 2020
  
  302018e0
- Delete .DS_Store · 4f37dac1
  Jacob Kaufman authored Feb 10, 2020
  
  4f37dac1
- Delete .DS_Store · dbe75192
  Jacob Kaufman authored Feb 10, 2020
  
  dbe75192
- Delete .DS_Store · 7dca4d58
  Jacob Kaufman authored Feb 10, 2020
  
  7dca4d58
- Fixed Files · e2e05b8d
  Jacob Kaufman authored Feb 10, 2020
  
  e2e05b8d
- Updating file structure, jupyter Notebooks, and Coordinate Classes · bf38bfea
  Jacob Kaufman authored Feb 10, 2020
  
  bf38bfea
- Merge branch 'master' of https://github.com/jkaufy/CartoCosmos-1 · af86d95d
  Jacob Kaufman authored Feb 10, 2020
  
  af86d95d
- deleting everything · 97471eb8
  Jacob Kaufman authored Feb 10, 2020
  
  97471eb8
- Added final coordinate classes and Jupyter Notebook · 3082e930
  Jacob Kaufman authored Feb 10, 2020
  
  3082e930
- Merge remote-tracking branch 'upstream/master' · a7755fd3
  Jacob Kaufman authored Feb 10, 2020
  a7755fd3
- Delete mousePositionExample.js · 84ccffed
  Jacob Kaufman authored Feb 10, 2020
  
  84ccffed
- Delete mousePosition.js · 5e6f7f42
  Jacob Kaufman authored Feb 10, 2020
  
  5e6f7f42
- Delete AstroMath.js · 48e2ba57
  Jacob Kaufman authored Feb 10, 2020
  
  48e2ba57
Feb 08, 2020
- Merge pull request #22 from scottaames/master · 7556d35b
  Scott Ames authored Feb 08, 2020
  7556d35b
- GUI polished and complete. Waiting for coordinate class merge. · 0a0cd7a4
  Scott Ames authored Feb 08, 2020
  
  0a0cd7a4
Feb 06, 2020
- GUI done · a3a75828
  Scott Ames authored Feb 06, 2020
  
  a3a75828
Feb 05, 2020
- Merge pull request #21 from scottaames/master · 6f1485fb
  Scott Ames authored Feb 05, 2020
  6f1485fb
- removed lib · 0b255a82
  Scott Ames authored Feb 05, 2020
  
  0b255a82
- removed lib · 1c77f548
  Scott Ames authored Feb 05, 2020
  
  1c77f548
- Merge pull request #20 from scottaames/master · fae99b10
  Scott Ames authored Feb 05, 2020
  fae99b10
- organized files · aa9ce5dc
  Scott Ames authored Feb 05, 2020
  
  aa9ce5dc
Feb 04, 2020
- updated files · c1610edf
  Scott Ames authored Feb 03, 2020
  
  c1610edf
- update branch to upstream/master · 47e04bf6
  Scott Ames authored Feb 03, 2020
  
  47e04bf6
- Merge branch 'master' of https://github.com/CartoCosmos/CartoCosmos into upstream/master · 92f161dc
  Scott Ames authored Feb 03, 2020
  
  92f161dc
- Merge pull request #17 from scottaames/react-gui · 9a419cc3
  Scott Ames authored Feb 03, 2020
  9a419cc3
- Delete index.js · c3cc2edd
  Scott Ames authored Feb 03, 2020
  
  c3cc2edd
- current · 26f59b75
  Scott Ames authored Feb 03, 2020
  
  26f59b75
Feb 03, 2020
- Merge pull request #13 from kaitlyndlee/map · b56e48b6
  cgm78 authored Feb 03, 2020
  b56e48b6