Skip to content

Commit

Permalink
Revert "Merge Dev into Stretch Feature Branch (#4251)" (#4252)
Browse files Browse the repository at this point in the history
This reverts commit daec78c.
  • Loading branch information
krlberry authored Jan 12, 2021
1 parent daec78c commit 11150fb
Show file tree
Hide file tree
Showing 1,023 changed files with 26,312 additions and 110,861 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4_Documentation_issue.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "\U0001F4D6 Documentation issue"
name: Documentation Issue
about: Report issues or problems with documentation.

---
Expand Down
4 changes: 1 addition & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,12 @@
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
<!--- - [ ] My code follows the code style of this project. -->
- [ ] I have read and agree to abide by the [Code of Conduct](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/Code-Of-Conduct.md)
- [ ] I have read and agree to abide by the [Code of Conduct](https://usgs-astrogeology.github.io/code/)
- [ ] I have read the [**CONTRIBUTING**](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CONTRIBUTING.md) document.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
- [ ] I have added myself to the [.zenodo.json](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/.zenodo.json) document.
- [ ] I have added any user impacting changes to the [CHANGELOG.md](https://github.com/USGS-Astrogeology/ISIS3/blob/dev/CHANGELOG.md) document.

## Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:
Expand Down
209 changes: 0 additions & 209 deletions .zenodo.json

This file was deleted.

140 changes: 64 additions & 76 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
@@ -1,79 +1,67 @@
Integrated Software for Imagers and Spectrometers Contributors
==============================================================
ISIS3 Contributors
==================

- Addair, Travis
- Adoram-Kershner, Lauren (United States Geological Survey, Astro
Geology Science Center)
- Alexandrov, Oleg
- Anderson, Jeff
- Annex, Andrew
- Austin, Christopher
- Backer, Jeanie
- Barrett, Janet
- Becker, Kris
- Berry, Kristin (United States Geological Survey, Astro Geology
Science Center)
- Beyer, Ross (SETI Institute and NASA Ames Research Center)
- Bonn, John
- Boyd, Mackenzie
- Brownsberger, Sasha
- Combs, Christopher
- Cook, Debbie
- Covington, Jeffrey
- Crough, James Alexander
- Curtis, Aaron
- Dunn, Evin (United States Geological Survey, Astro Geology Science
Center)
- Edmundson, Kenneth
- Eis, Mathew
- Gault, Eric
- Giroux, Aaron
- Giroux, Tim (United States Geological Survey, Astro Geology Science
Center)
- Goins, Adam
- Hahn, Marjorie
- Heyer, Eric
- Howington-Kraus, Elpitha
- Humphrey, Ian
- Lambright, Steven
- Laura, Jason (United States Geological Survey, Astro Geology Science
Center)
- Lee, Ella Mae
- Lee, Kaitlyn (United States Geological Survey, Astro Geology Science
Center)
- Mapel, Jesse (United States Geological Survey, Astro Geology Science
Center)
- Milazzo, Moses
- Miller, David
- Neubauer, Cole
- Oyama, Kim
- Paquette, Adam (United States Geological Survey, Astro Geology
Science Center)
- Prasad, Sharmilla
- Rideout, Jai
- Rodriguez, Kelvin (United States Geological Survey, Astro Geology
Science Center)
- Rose, Curtis
- Saleh, Raad
- Sanders, Austin (United States Geological Survey, Astro Geology
Science Center)
- Seignovert, Benoit
- Shepard, Makayla
- Shinaman, John (United States Geological Survey, Astro Geology
Science Center)
- Sides, Stuart (United States Geological Survey, Astro Geology
Science Center)
- Silva, Victor
- Stapleton, Summer
- Stebenne, Andrew
- Sucharski, Tracie
- Thomas, Orrin
- Weller, Lynn (United States Geological Survey, Astro Geology Science
Center)
- Williams, Kaj (United States Geological Survey, Astro Geology
Science Center)
- Wilson, Tyler
- Aaron Curtis
- Adam Goins
- Adam Paquette
- Andrew Annex
- Andrew Stebenne
- Austin Sanders
- B. Seignovert
- Christopher Austin
- Christopher Ryan Combs Jr
- Cole Neubauer
- Curtis Rose
- David Miller
- Debbie Cook
- Ella Mae Lee
- Elpitha Howington-Kraus
- Eric Gault
- Eric Hyer
- Evin Dunn
- Ian Humphrey
- Jac Shinaman
- Jai Rideout
- James Alexander Crough
- Janet Barrett
- Jason Laura
- Jeannie Backer
- Jeff Anderson
- Jeffrey Covington
- Jesse Mapel
- John Bonn
- Kaitlyn Lee
- Kaj E Williams
- Kelvin Rodriguez
- Ken Edmundson
- Kim Oyama
- Kris Becker
- Kristin Berry
- Lauren Adoram-Kershner
- Lynn Weller
- Mackenzie Boyd
- Makayla Shepherd
- Marjorie Hahn
- Mathew Eis
- Michael Aye
- Moses Milazzo
- Oleg Alexandrov
- Orrin Thomas
- Peter Giroux
- Raad A. Saleh
- Ross Beyer
- Sasha Brownsberger
- Sharmilla Prasad
- Steven Lambright
- Stuart Sides
- Summer Stapleton
- Tracie Sucharski
- Travis Addair
- Tyler Wilson
- Victor Silva

-----
This list was generated from the .zenodo.json file by running the
isis/scripts/zenodo_to_authors.py Python program.
This list was initially generated using this bash command (additional manual edits are needed):

git log --pretty="- %an %n" | sort | uniq -i >> AUTHORS.rst

Loading

0 comments on commit 11150fb

Please sign in to comment.