adding branches#76

Open

Gbrad1 wants to merge 55 commits intoZipCodeCore:masterfrom

Gbrad1:CoreFeatures

Commits on Feb 7, 2020

adding branches

Giles Bradford
authored and
Giles Bradford
committed
Test

Giles Bradford
authored and
Giles Bradford
committed
added comment
KhalilCrumpler
committed
add misc
KhalilCrumpler
committed
updated misc
KhalilCrumpler
committed
updating

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #1 from Gbrad1/CoreFeatures
Gbrad1
authored
Added backspace
KhalilCrumpler
committed
added empty methods

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #2 from Gbrad1/CoreFeatures
Gbrad1
authored
added scientific functions
KhalilCrumpler
committed
erging fromDev
KhalilCrumpler
committed
Added empty constructor

Giles Bradford
authored and
Giles Bradford
committed
Merge branch 'Dev' of https://github.com/Gbrad1/ScientificCalculator.Maven into CoreFeatures

Giles Bradford
authored and
Giles Bradford
committed
working on a test

Jeremy McCray
authored and
Jeremy McCray
committed

Commits on Feb 8, 2020

Added some adder tests

Jeremy McCray
authored and
Jeremy McCray
committed
added scientific functions
KhalilCrumpler
committed
Core Function updated. Compiling but still WIP

Giles Bradford
authored and
Giles Bradford
committed
resolved merge conflict

Jeremy McCray
authored and
Jeremy McCray
committed
adding code for the night

Giles Bradford
authored and
Giles Bradford
committed
finish merge
KhalilCrumpler
committed
added all fucntions under scientific
KhalilCrumpler
committed
added a a handful of working tests

Jeremy McCray
authored and
Jeremy McCray
committed
added/updated functions
KhalilCrumpler
committed
added constructor
KhalilCrumpler
committed
added factorial
KhalilCrumpler
committed
Adding revisions to console and main file

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #3 from Gbrad1/CoreFeatures
Gbrad1
authored
tests1252

Jeremy McCray
authored and
Jeremy McCray
committed
fixed merge conflict
KhalilCrumpler
committed
Merge pull request #4 from Gbrad1/ScientificFeatures
Gbrad1
authored
Merge branch 'Dev' into Tests
Gbrad1
authored
Merge pull request #5 from Gbrad1/Tests
Gbrad1
authored
asdasdasd

Jeremy McCray
authored and
Jeremy McCray
committed
updating my code to update Tests.

Giles Bradford
authored and
Giles Bradford
committed
added more tests 149

Jeremy McCray
authored and
Jeremy McCray
committed
added more tests 149

Jeremy McCray
authored and
Jeremy McCray
committed
adding menus

Giles Bradford
authored and
Giles Bradford
committed
moved everything to the correct test class

Jeremy McCray
authored and
Jeremy McCray
committed
Merge pull request #6 from Gbrad1/CoreFeatures
Gbrad1
authored
moved everything to the correct test class

Jeremy McCray
authored and
Jeremy McCray
committed
Merge pull request #7 from Gbrad1/Tests
Gbrad1
authored
added a bunch of tests and went to eat

Jeremy McCray
authored and
Jeremy McCray
committed

Commits on Feb 9, 2020

Adding a working calculator that literally only does math.

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #8 from Gbrad1/CoreFeatures
Gbrad1
authored
Merge pull request #9 from Gbrad1/Tests
Gbrad1
authored
Commiting what works

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #10 from Gbrad1/CoreFeatures
Gbrad1
authored
updating to most recent version.

Giles Bradford
authored and
Giles Bradford
committed
Merge pull request #11 from Gbrad1/CoreFeatures
Gbrad1
authored
making me commit before it pullzzzzzz

Jeremy McCray
authored and
Jeremy McCray
committed
pushing after pulling to see if this is wokring correctly

Jeremy McCray
authored and
Jeremy McCray
committed

Commits on Feb 10, 2020

fixed a few bugs but work still needs to be done to fix the memory and memory clearing

Jeremy McCray
authored and
Jeremy McCray
committed
Merge pull request #12 from Gbrad1/Tests
Gbrad1
authored
final commit

Giles Bradford
authored and
Giles Bradford
committed