Dev pull test#87

Open

zanettanorris wants to merge 79 commits into

ZipCodeCore:masterfrom

jwilkinson6179:dev

Commits on Feb 7, 2020

Another test

James Wilkinson
authored and
James Wilkinson
committed
Branches added

James Wilkinson
authored and
James Wilkinson
committed

Commits on Feb 8, 2020

Branches added

James Wilkinson
authored and
James Wilkinson
committed
Attempted to add branches?

James Wilkinson
authored and
James Wilkinson
committed
tracking adding to sandy branch

Sandeep Naraya
authored and
Sandeep Naraya
committed
Delete seed
snmangalam2708
authored
Silly test

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #1 from jwilkinson6179/james
jwilkinson6179
authored
Create seed
snmangalam2708
authored
sandy

Sandeep Naraya
authored and
Sandeep Naraya
committed
Delete seed
snmangalam2708
authored
remove sed2

Sandeep Naraya
authored and
Sandeep Naraya
committed
Delete seed2
snmangalam2708
authored
added seed3

Sandeep Naraya
authored and
Sandeep Naraya
committed
Merge branch 'sandy' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into sandy

Sandeep Naraya
authored and
Sandeep Naraya
committed
check

Sandeep Naraya
authored and
Sandeep Naraya
committed
gr8ness

Sandeep Naraya
authored and
Sandeep Naraya
committed
remove gr8

Sandeep Naraya
authored and
Sandeep Naraya
committed
test

Sandeep Naraya
authored and
Sandeep Naraya
committed
adding hello

Sandeep Naraya
authored and
Sandeep Naraya
committed
Small comment edit

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into sandy

Sandeep Naraya
authored and
Sandeep Naraya
committed
.

Sandeep Naraya
authored and
Sandeep Naraya
committed
Memory added

James Wilkinson
authored and
James Wilkinson
committed
Memory working and tested

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #2 from jwilkinson6179/james
jwilkinson6179
authored
Merge pull request #3 from snmangalam2708/sandy
jwilkinson6179
authored
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into zanetta

Zanetta Norris
authored and
Zanetta Norris
committed
Testing push

Zanetta Norris
authored and
Zanetta Norris
committed
Merge pull request #4 from jwilkinson6179/zanetta
jwilkinson6179
authored
Building basic math methods and tests

Zanetta Norris
authored and
Zanetta Norris
committed
Merge pull request #5 from jwilkinson6179/zanetta
jwilkinson6179
authored
Please don't kill me

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed

Commits on Feb 9, 2020

Added eight new basic math methods, and seven additional test cases.

Zanetta Norris
authored and
Zanetta Norris
committed
Merge pull request #6 from jwilkinson6179/zanetta
jwilkinson6179
authored
About to pull dev

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed
Done for the night

James Wilkinson
authored and
James Wilkinson
committed
added more test cases for basic math

Zanetta Norris
authored and
Zanetta Norris
committed
BoxMaker untested

James Wilkinson
authored and
James Wilkinson
committed
Changed display, broke tests

James Wilkinson
authored and
James Wilkinson
committed
Test cases for display

James Wilkinson
authored and
James Wilkinson
committed
BoxMaker tests

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #7 from jwilkinson6179/james
jwilkinson6179
authored
Sleep

James Wilkinson
authored and
James Wilkinson
committed
Adding Trig/Log/OtherFunctions

Sandeep Naraya
authored and
Sandeep Naraya
committed
AddedConversion Math Class and Conversion Math Test Class

Zanetta Norris
authored and
Zanetta Norris
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into zanetta

Zanetta Norris
authored and
Zanetta Norris
committed
final

Sandeep Naraya
authored and
Sandeep Naraya
committed
Merge pull request #8 from jwilkinson6179/sandy
jwilkinson6179
authored
Nervous about pull

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed
minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
Added Feet to Meters conversion

Zanetta Norris
authored and
Zanetta Norris
committed
Minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
Minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
Minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
Merge pull request #9 from jwilkinson6179/sandy
snmangalam2708
authored
Pull from dev

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed
Adding valid operations

James Wilkinson
authored and
James Wilkinson
committed
Fixed the test cases to evaluate to four decimal places

Zanetta Norris
authored and
Zanetta Norris
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into zanetta

Zanetta Norris
authored and
Zanetta Norris
committed
Merge pull request #10 from jwilkinson6179/zanetta
jwilkinson6179
authored
Pulling from dev

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed
BasicMath and Conversion Math methods and tests complete. All tests pass.

Zanetta Norris
authored and
Zanetta Norris
committed
Need to fix modes

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #11 from jwilkinson6179/zanetta
jwilkinson6179
authored
Merge trouble

James Wilkinson
authored and
James Wilkinson
committed
Merge branch 'dev' of https://github.com/jwilkinson6179/ScientificCalculator.Maven into james

James Wilkinson
authored and
James Wilkinson
committed
More cases

James Wilkinson
authored and
James Wilkinson
committed
Lots of bugs

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #12 from jwilkinson6179/james
jwilkinson6179
authored
Fixed conversion

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #13 from jwilkinson6179/james
jwilkinson6179
authored

Commits on Feb 10, 2020

Final submission for demo

James Wilkinson
authored and
James Wilkinson
committed
Merge pull request #14 from jwilkinson6179/james
jwilkinson6179
authored