Dev#91

Open

DavidKellyonGitHub wants to merge 100 commits intoZipCodeCore:masterfrom

Commits on Feb 7, 2020

gfg

Emma Beech
authored and
Emma Beech
committed
added test file

David Kelly
authored and
David Kelly
committed
dsf

Emma Beech
authored and
Emma Beech
committed

Commits on Feb 8, 2020

added outline of basic functions and some sci functions, test push here.
DavidKellyonGitHub
committed
testing push

Gregory Davis
authored and
Gregory Davis
committed
outlined all basic and sci functions, named all methods
DavidKellyonGitHub
committed
first test commit

Emma Beech
authored and
Emma Beech
committed
gitignore DS

Emma Beech
authored and
Emma Beech
committed
fixed merge conflicts

Emma Beech
authored and
Emma Beech
committed
delete ds_Store

Emma Beech
authored and
Emma Beech
committed
Merge pull request #3 from ebeech1990/emma
ebeech1990
authored
Added more test fields

Gregory Davis
authored and
Gregory Davis
committed
added more menu options

Emma Beech
authored and
Emma Beech
committed
Merge pull request #4 from ebeech1990/emma
ebeech1990
authored
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dev
DavidKellyonGitHub
committed
added Classes trying to push
DavidKellyonGitHub
committed
Even more test shells

Gregory Davis
authored and
Gregory Davis
committed
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into gregbranch

Gregory Davis
authored and
Gregory Davis
committed
completed Basic methods.
DavidKellyonGitHub
committed
completed Basic methods
DavidKellyonGitHub
committed
string calc methods

Emma Beech
authored and
Emma Beech
committed
Changing test code

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #5 from ebeech1990/emma
ebeech1990
authored
completed Sci methods
DavidKellyonGitHub
committed
Merge pull request #6 from ebeech1990/gregbranch
gdavis24
authored
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dave
DavidKellyonGitHub
committed
ff

Emma Beech
authored and
Emma Beech
committed
reverted Basic to float methods
DavidKellyonGitHub
committed
error-free Basic
DavidKellyonGitHub
committed
error-free Sci
DavidKellyonGitHub
committed
more test fixing

Gregory Davis
authored and
Gregory Davis
committed
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into gregbranch

Gregory Davis
authored and
Gregory Davis
committed
fd

Emma Beech
authored and
Emma Beech
committed
dfsa

Emma Beech
authored and
Emma Beech
committed
attempting to fix mistakes

Gregory Davis
authored and
Gregory Davis
committed
updating tests

Gregory Davis
authored and
Gregory Davis
committed
trying to get tests to work

Gregory Davis
authored and
Gregory Davis
committed
1:00

Emma Beech
authored and
Emma Beech
committed
Merge pull request #7 from ebeech1990/emma
ebeech1990
authored
1:00 update
DavidKellyonGitHub
committed
Merge pull request #8 from ebeech1990/gregbranch
gdavis24
authored
1:06 update
DavidKellyonGitHub
committed
Merge pull request #9 from ebeech1990/dave
gdavis24
authored
updated Sci
DavidKellyonGitHub
committed
most of menu created

Emma Beech
authored and
Emma Beech
committed
Merge pull request #10 from ebeech1990/emma
ebeech1990
authored
2:25 All basic tests and most sci tests working

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #11 from ebeech1990/gregbranch
gdavis24
authored
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dave
DavidKellyonGitHub
committed
most of ui done

Emma Beech
authored and
Emma Beech
committed
Merge pull request #13 from ebeech1990/emma
ebeech1990
authored
247 commit
DavidKellyonGitHub
committed
Merge pull request #12 from ebeech1990/dave
DavidKellyonGitHub
authored
changed float to double
DavidKellyonGitHub
committed
int to double

Emma Beech
authored and
Emma Beech
committed
Merge pull request #14 from ebeech1990/emma
ebeech1990
authored

Commits on Feb 9, 2020

mostly working

Emma Beech
authored and
Emma Beech
committed
Merge pull request #15 from ebeech1990/emma
ebeech1990
authored
copy paste from github 1013amSun
DavidKellyonGitHub
committed
changed inverse log and floats to doubles in sci. 10:20

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #16 from ebeech1990/gregbranch
gdavis24
authored
fixed some nav issues

Emma Beech
authored and
Emma Beech
committed
Merge pull request #17 from ebeech1990/emma
ebeech1990
authored
added comments 10:46

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #18 from ebeech1990/gregbranch
gdavis24
authored
updated memory in Sci
DavidKellyonGitHub
committed
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dave
DavidKellyonGitHub
committed
1106 fixed memclear
DavidKellyonGitHub
committed
moved most of main to console

Emma Beech
authored and
Emma Beech
committed
Merge pull request #19 from ebeech1990/emma
ebeech1990
authored
fixed merge conflicts 1110sun
DavidKellyonGitHub
committed
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dave
DavidKellyonGitHub
committed
fixed arg err

Emma Beech
authored and
Emma Beech
committed
Merge pull request #20 from ebeech1990/emma
ebeech1990
authored
Merge branch 'dev' of https://github.com/ebeech1990/ScientificCalculator.Maven into dave
DavidKellyonGitHub
committed
pushing memstuff
DavidKellyonGitHub
committed
Merge pull request #21 from ebeech1990/dave
DavidKellyonGitHub
authored
All tests in, math works except when java is stupid. 12:03

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #22 from ebeech1990/gregbranch
gdavis24
authored
work damn you

Emma Beech
authored and
Emma Beech
committed
added comments 12:58

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #23 from ebeech1990/emma
ebeech1990
authored
Merge pull request #24 from ebeech1990/gregbranch
gdavis24
authored
resolved memory with console
DavidKellyonGitHub
committed
Merge pull request #25 from ebeech1990/dave
DavidKellyonGitHub
authored
added custom features 1:42

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #26 from ebeech1990/gregbranch
gdavis24
authored
main menu works

Emma Beech
authored and
Emma Beech
committed
fixed memory erros
DavidKellyonGitHub
committed
ddd

Emma Beech
authored and
Emma Beech
committed
Merge pull request #27 from ebeech1990/dave
DavidKellyonGitHub
authored
Merge pull request #28 from ebeech1990/emma
ebeech1990
authored
fixed util

Emma Beech
authored and
Emma Beech
committed
Merge pull request #29 from ebeech1990/emma
ebeech1990
authored
temp works! 2:12

Gregory Davis
authored and
Gregory Davis
committed
Merge pull request #30 from ebeech1990/gregbranch
gdavis24
authored
uml

Emma Beech
authored and
Emma Beech
committed
Merge pull request #31 from ebeech1990/emma
ebeech1990
authored
uml

Emma Beech
authored and
Emma Beech
committed
Merge pull request #32 from ebeech1990/emma
ebeech1990
authored