Code

Final Changes#96

Code

Open

Gbrad1 wants to merge 57 commits intoZipCodeCore:masterZipCodeCore/ScientificCalculator:masterfrom Gbrad1:masterGbrad1/ScientificCalculator.Maven:masterCopy head branch name to clipboard

+1,078-15

Commits

Commits on Feb 7, 2020

• adding branches

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  de09613

• Test

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  eb68778

• added comment

  KhalilCrumpler

  committed
  098e0d7

• add misc

  KhalilCrumpler

  committed
  7bdc7df

• updated misc

  KhalilCrumpler

  committed
  ba4de8d

• updating

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  82dfd07

• Merge pull request #1 from Gbrad1/CoreFeatures

  Show description for a7d0e85
  Gbrad1

  authored
  a7d0e85

• Added backspace

  KhalilCrumpler

  committed
  fab6b7b

• added empty methods

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  49368cd

• Merge pull request #2 from Gbrad1/CoreFeatures

  Show description for e676d24
  Gbrad1

  authored
  e676d24

• added scientific functions

  KhalilCrumpler

  committed
  ba9ee36

• erging fromDev

  KhalilCrumpler

  committed
  536f2ce

• Added empty constructor

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  4cf0b75

• Merge branch 'Dev' of https://github.com/Gbrad1/ScientificCalculator.Maven into CoreFeatures

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  fbe4b66

• working on a test

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  0ddeebc

Commits on Feb 8, 2020

• Added some adder tests

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  5173157

• added scientific functions

  KhalilCrumpler

  committed
  64a2797

• Core Function updated. Compiling but still WIP

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  b82baad

• resolved merge conflict

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  966ca8a

• adding code for the night

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  1744e1a

• finish merge

  KhalilCrumpler

  committed
  e0425f9

• added all fucntions under scientific

  KhalilCrumpler

  committed
  979c858

• added a a handful of working tests

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  51b1b72

• added/updated functions

  KhalilCrumpler

  committed
  5011f42

• added constructor

  KhalilCrumpler

  committed
  df46321

• added factorial

  KhalilCrumpler

  committed
  b2c4e87

• Adding revisions to console and main file

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  a7fe826

• Merge pull request #3 from Gbrad1/CoreFeatures

  Show description for 9a2def5
  Gbrad1

  authored
  9a2def5

• tests1252

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  0acf8f0

• fixed merge conflict

  KhalilCrumpler

  committed
  e907eaa

• Merge pull request #4 from Gbrad1/ScientificFeatures

  Show description for fd356d4
  Gbrad1

  authored
  fd356d4

• Merge branch 'Dev' into Tests

  Gbrad1

  authored
  0a91e6c

• Merge pull request #5 from Gbrad1/Tests

  Show description for b8810c0
  Gbrad1

  authored
  b8810c0

• asdasdasd

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  4720d9d

• updating my code to update Tests.

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  ee90439

• added more tests 149

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  dab68dd

• added more tests 149

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  b1df9c2

• adding menus

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  06a3e8b

• moved everything to the correct test class

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  d36cce5

• Merge pull request #6 from Gbrad1/CoreFeatures

  Show description for 4361abe
  Gbrad1

  authored
  4361abe

• moved everything to the correct test class

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  4316f68

• Merge pull request #7 from Gbrad1/Tests

  Show description for 57efba7
  Gbrad1

  authored
  57efba7

• added a bunch of tests and went to eat

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  9e3c803

Commits on Feb 9, 2020

• Adding a working calculator that literally only does math.

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  37b930a

• Merge pull request #8 from Gbrad1/CoreFeatures

  Show description for a0d3c8b
  Gbrad1

  authored
  a0d3c8b

• Merge pull request #9 from Gbrad1/Tests

  Show description for 6c126e5
  Gbrad1

  authored
  6c126e5

• Commiting what works

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  999474d

• Merge pull request #10 from Gbrad1/CoreFeatures

  Show description for b11869d
  Gbrad1

  authored
  b11869d

• updating to most recent version.

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  7f7e97e

• Merge pull request #11 from Gbrad1/CoreFeatures

  Show description for 7e89f48
  Gbrad1

  authored
  7e89f48

• making me commit before it pullzzzzzz

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  0574a95

• pushing after pulling to see if this is wokring correctly

  

  Jeremy McCray

  authored and

  Jeremy McCray

  committed
  3849531

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
  b201c04

• Merge pull request #12 from Gbrad1/Tests

  Show description for f8698e0
  Gbrad1

  authored
  f8698e0

• final commit

  

  Giles Bradford

  authored and

  Giles Bradford

  committed
  c7c2df0

• Merge pull request #13 from Gbrad1/CoreFeatures

  Show description for c00bf0a
  Gbrad1

  authored
  c00bf0a

• Merge pull request #14 from Gbrad1/Dev

  Show description for 3e2b097
  Gbrad1

  authored
  3e2b097