Code

Madelyn and john#3

Code

Open

MadelynTav wants to merge 79 commits intoaccesscode-2-1:masteraccesscode-2-1/calculator:masterfrom MadelynTav:Madelyn_And_JohnMadelynTav/calculator:Madelyn_And_JohnCopy head branch name to clipboard

+2,969

Commits

Commits on May 5, 2015

• Initial commit

  MadelynTav

  committed
  e48e18a

Commits on May 6, 2015

• Skeleton

  MadelynTav

  committed
  97c6850

• merge github.com:MadelynTav/CalculatorAppProject

  Show description for 3e40df1
  MadelynTav

  committed
  3e40df1

Commits on May 10, 2015

• layouts laid out

  MadelynTav

  committed
  821ac8b

Commits on May 14, 2015

• Lib update

  MadelynTav

  committed
  c211077

• added buttons to the main in java

  lighterletter

  committed
  b1f646a

• merging buttons made branch

  lighterletter

  committed
  cce9308

• slight arrangements to the buttons. need to update with expressions.java

  lighterletter

  committed
  ec7e568

Commits on May 16, 2015

• John's changes on Buttons

  lighterletter

  committed
  98b94f5

• Madeys Changes

  MadelynTav

  committed
  3784fe3

• added e to expressions.java

  lighterletter

  committed
  0d3e17d

• merged

  MadelynTav

  committed
  0575617

• Merged files

  Show description for da77b0d
  MadelynTav

  committed
  da77b0d

• making some more changes

  MadelynTav

  committed
  c513963

• Added TODOs

  MadelynTav

  committed
  60765f9

• added launcher icon and background image to layout

  lighterletter

  committed
  26a1318

• updates

  MadelynTav

  committed
  83ddcb1

• after merge additional POS and NEG mathods

  MadelynTav

  committed
  46cf4d4

Commits on May 17, 2015

• Playing around with percentChange method

  MadelynTav

  committed
  4595578

• updates

  MadelynTav

  committed
  ce3fc2e

• finished ans function

  lighterletter

  committed
  3f707e1

• Pos/Neg

  MadelynTav

  committed
  9a7fea9

• POS/NEG

  MadelynTav

  committed
  e4b86a6

• merged negative with ANS

  MadelynTav

  committed
  dadb2a2

• NUll pointer exception

  MadelynTav

  committed
  6ff931b

• added more exception handling

  lighterletter

  committed
  727b76d

• changes

  MadelynTav

  committed
  5b63f50

• Merge github.com:MadelynTav/CalculatorAppProject

  Show description for c3dd649
  MadelynTav

  committed
  c3dd649

• minute changes

  lighterletter

  committed
  a6399ee

• added absolute value

  lighterletter

  committed
  1e3036d

• added to do and fixed PI

  lighterletter

  committed
  c5e0a9f

• fixed pi, log, and exponent functions

  lighterletter

  committed
  3c00dc5

• Playing with parens

  MadelynTav

  committed
  a8afb74

• merging

  MadelynTav

  committed
  9c88ec9

Commits on May 18, 2015

• Abs editing

  MadelynTav

  committed
  bdd4840

• saving log10 sqrt fixes and preparing for current merge

  lighterletter

  committed
  fdb8966

• Merge branch 'master' of github.com:MadelynTav/CalculatorAppProject

  Show description for 033a3b9
  lighterletter

  committed
  033a3b9

• validating parens working

  MadelynTav

  committed
  c51a80a

• Smart Parens Added

  MadelynTav

  committed
  6c9a0df

• merging

  lighterletter

  committed
  fe9f8eb

• added inverse operands, organized button layout, added diff background, added phi

  lighterletter

  committed
  312f690

Commits on May 19, 2015

• clearing screen

  MadelynTav

  committed
  09fa570

• merging with clear screen intact

  MadelynTav

  committed
  169e9be

• fixed bug for screen clear

  MadelynTav

  committed
  f86caf3

• cleaned up code, fixed vertical parenthesis, rearranged horizontal layout

  lighterletter

  committed
  b8447ba

• fixed socah bug

  MadelynTav

  committed
  7a36177

• Merge github.com:MadelynTav/CalculatorAppProject

  Show description for 4773df1
  MadelynTav

  committed
  4773df1

• arcs changes

  MadelynTav

  committed
  c4dfaa2

• fixing inconsistencies

  MadelynTav

  committed
  341d839

• fixed AC

  MadelynTav

  committed
  51cb70f

• layout fix, removed unecessary buttons

  lighterletter

  committed
  39f1418

• please test

  MadelynTav

  committed
  53c24cc

• fixing layout elements

  lighterletter

  committed
  d7819eb

• fixed button layout and merge conflicts

  lighterletter

  committed
  7b0dfa8

• savedIntanceState added

  MadelynTav

  committed
  0e9ff32

• SaveOnInstance Fixed and equals fixed

  MadelynTav

  committed
  9215043

• debugging

  MadelynTav

  committed
  e802fd5

• Updated TODOS

  MadelynTav

  committed
  ba4c493

• Another addition to TODO

  MadelynTav

  committed
  09deed7

• less passive

  MadelynTav

  committed
  31bd42a

• ans working and updating

  MadelynTav

  committed
  ed4a872

• edge cases TODO added

  MadelynTav

  committed
  0a135ad

• backtracking

  MadelynTav

  committed
  ce8e808

• fixed AC

  MadelynTav

  committed
  fc05434

• Prepped code for clean up.

  lighterletter

  committed
  5d6bd4b

• merging after epic bug fix.

  lighterletter

  committed
  8fdf07e

• working calculator. Correct results

  lighterletter

  committed
  f7c9211

Commits on May 20, 2015

• major overhaul many bugs fixed layout and function cleaner.

  lighterletter

  committed
  3c80173

• Delete X!

  lighterletter

  committed
  389cc3e

• changes

  MadelynTav

  committed
  2ce9620

• added comments and fixed minor parens problem

  MadelynTav

  committed
  23e6ec9

Commits on May 21, 2015

• cleaned up comments reformatted code

  lighterletter

  committed
  52d684a

• Update README.md

  lighterletter

  committed
  cea1374

• Update README.md

  lighterletter

  committed
  160a46c

• factorial method and button added

  MadelynTav

  committed
  2aa7fa0

• added error handling

  lighterletter

  committed
  3a618d5

• Project

  MadelynTav

  committed
  1c7ba0c

• Madelyn and John

  MadelynTav

  committed
  2034568

• update

  MadelynTav

  committed
  a908274