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
f46e8aa
Branches added

James Wilkinson
authored and
James Wilkinson
committed
38d58aa

Commits on Feb 8, 2020

Branches added

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

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

Sandeep Naraya
authored and
Sandeep Naraya
committed
1a99ecb
Delete seed
snmangalam2708
authored
449656c
Silly test

James Wilkinson
authored and
James Wilkinson
committed
6d30b31
Merge pull request #1 from jwilkinson6179/james
jwilkinson6179
authored
64da807
Create seed
snmangalam2708
authored
ebc6614
sandy

Sandeep Naraya
authored and
Sandeep Naraya
committed
c3351e9
Delete seed
snmangalam2708
authored
5c6a06a
remove sed2

Sandeep Naraya
authored and
Sandeep Naraya
committed
277e774
Delete seed2
snmangalam2708
authored
5791ccc
added seed3

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

Sandeep Naraya
authored and
Sandeep Naraya
committed
32e0d4a
check

Sandeep Naraya
authored and
Sandeep Naraya
committed
53845bf
gr8ness

Sandeep Naraya
authored and
Sandeep Naraya
committed
9448eb0
remove gr8

Sandeep Naraya
authored and
Sandeep Naraya
committed
9a2edeb
test

Sandeep Naraya
authored and
Sandeep Naraya
committed
3ffeeed
adding hello

Sandeep Naraya
authored and
Sandeep Naraya
committed
3115773
Small comment edit

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

Sandeep Naraya
authored and
Sandeep Naraya
committed
c7d636f
.

Sandeep Naraya
authored and
Sandeep Naraya
committed
877626e
Memory added

James Wilkinson
authored and
James Wilkinson
committed
aebe5d3
Memory working and tested

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

Zanetta Norris
authored and
Zanetta Norris
committed
adfaf1b
Testing push

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

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

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

James Wilkinson
authored and
James Wilkinson
committed
4727ee3

Commits on Feb 9, 2020

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

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

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

James Wilkinson
authored and
James Wilkinson
committed
9110355
Done for the night

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

Zanetta Norris
authored and
Zanetta Norris
committed
dd97db4
BoxMaker untested

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

James Wilkinson
authored and
James Wilkinson
committed
6413303
Test cases for display

James Wilkinson
authored and
James Wilkinson
committed
a12ff3e
BoxMaker tests

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

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

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

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

Zanetta Norris
authored and
Zanetta Norris
committed
75e16f5
final

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

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

James Wilkinson
authored and
James Wilkinson
committed
88e283d
minor changes

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

Zanetta Norris
authored and
Zanetta Norris
committed
b282193
Minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
d41fcc5
Minor changes

Sandeep Naraya
authored and
Sandeep Naraya
committed
139b464
Minor changes

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

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

James Wilkinson
authored and
James Wilkinson
committed
bf2ee27
Adding valid operations

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

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

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

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

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

Zanetta Norris
authored and
Zanetta Norris
committed
5653206
Need to fix modes

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

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

James Wilkinson
authored and
James Wilkinson
committed
27527b9
More cases

James Wilkinson
authored and
James Wilkinson
committed
5898407
Lots of bugs

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

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

Commits on Feb 10, 2020

Final submission for demo

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

Uh oh!

Commits

Commits on Feb 7, 2020

Commits on Feb 8, 2020

Commits on Feb 9, 2020

Commits on Feb 10, 2020