trtong
/
ZCW-MacroLabs-OOP-ScientificCalculator
forkad från ZipCodeWilmington/ZCW-MacroLabs-OOP-ScientificCalculator
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Activity

Commit-graf

  • *
  • *
  • |\
  • | *
  • | |\
  • | |/
  • |/|
  • | *
  • * |
  • * |
  • |\ \
  • | |/
  • |/|
  • * |
  • | *
  • |/
  • *
  • |\
  • | *
  • | |\
  • * | |
  • |/ /
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • |\ \
  • | * \
  • | |\ \
  • | |/ /
  • |/| |
  • | | *
  • * | |
  • |\ \ \
  • | | |/
  • | |/|
  • * | |
  • | | *
  • | * |
  • * | |
  • * | |
  • | * |
  • | | *
  • | | *
  • | * |
  • |/ /
  • | *
  • |/
  • *
  • *
  • |\
  • | *
  • |/
  • *
  • *
  • *
  • *
  • *
  • |\
  • * \
  • |\ \
  • * | |
  • | | *
  • | | |\
  • | | | *
  • * | | |
  • | | * |
  • | | |\ \
  • | |/ / /
  • | | | _
  • | | *
  • | | |\
  • | | |/
  • | |/|
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | | *
  • | | *
  • | * |
  • | * |
  • | |\ \
  • | |/ /
  • |/| |
  • * | |
  • * | |
  • * | |
  • * | |
  • | | *
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • * | |
  • | * |
  • * | |
  • * | |
  • | * |
  • | * |
  • * | |
  • |/ /
  • * |
  • |\ \
  • | |/
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • |\ \
  • | | *
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | | |/
  • | |/|
  • | | *
  • | * |
  • | | *
  • | | *
  • | | *
  • | |/
  • |/|
  • * |
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • 18501e8 (HEAD -> master) Fixed Memory Method by Trinh Tong 2018-10-22 17:10:11 -0400
  • 434b97f (trinhsCalc) Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:54:15 +0000
  • bd9cb08 (refs/pull/11/head) fixed merge by Lauren Green 2018-10-22 15:53:41 -0400
  • 76341ef added log by Lauren Green 2018-10-22 15:52:12 -0400
  • 79238f4 Added testing for baseOptions by Trinh Tong 2018-10-22 15:49:14 -0400
  • b738e02 Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:43:59 +0000
  • 8004e80 Added memory statements to console by Trinh Tong 2018-10-22 15:43:19 -0400
  • c4d9abf (refs/pull/10/head) added factorial method by Michelle DiMarino 2018-10-22 15:38:30 -0400
  • c4030f2 repulled info from repo by Trinh Tong 2018-10-22 15:20:51 -0400
  • 3fa2b86 Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:20:22 +0000
  • 1a1d0e0 udpated from repo by Trinh Tong 2018-10-22 15:20:04 -0400
  • d558eee (refs/pull/9/head) merge conflict resolved by Michelle DiMarino 2018-10-22 15:19:45 -0400
  • e18dd70 Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:15:11 +0000
  • bd40934 (refs/pull/7/head) fixed merge conflicts by Lauren Green 2018-10-22 15:15:00 -0400
  • 992c2dd added square root by Michelle DiMarino 2018-10-22 15:08:14 -0400
  • 49d5555 Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:05:35 +0000
  • aad32b3 updating memory functions by Trinh Tong 2018-10-22 15:05:09 -0400
  • 80fc55d added error message for inverse of 0 by Lauren Green 2018-10-22 15:02:33 -0400
  • 3a48038 (refs/pull/8/head) fixed realAdvanced menu by Michelle DiMarino 2018-10-22 14:58:20 -0400
  • 084e369 updating memory functions by Trinh Tong 2018-10-22 14:55:07 -0400
  • 6865188 updating memory functions by Trinh Tong 2018-10-22 14:54:59 -0400
  • c4d8b4c added option 5 to console by Michelle DiMarino 2018-10-22 14:50:47 -0400
  • e9d881a JK now I actually fixed error for div by 0 by Lauren Green 2018-10-22 14:46:50 -0400
  • 4b0251e Fixed division by 0 print by Lauren Green 2018-10-22 14:42:25 -0400
  • c23491b added test classes and absolute value by Michelle DiMarino 2018-10-22 14:36:26 -0400
  • 598f39d Test Classes added as well as making it so answer is not printed when dividing by 0 by Lauren Green 2018-10-22 14:33:52 -0400
  • 475d56c EVERYTHING COMING TOGETHER by Trinh Tong 2018-10-22 14:01:12 -0400
  • a9b3412 Merge branch 'master' of mdimarino/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 17:33:17 +0000
  • 15f2655 (refs/pull/6/head) advanced calculations by Michelle DiMarino 2018-10-22 13:32:32 -0400
  • 95cd8c6 Updated console and methods connecting to it by Trinh Tong 2018-10-22 13:21:52 -0400
  • a38b96c Updated console and methods connecting to it by Trinh Tong 2018-10-22 13:16:12 -0400
  • 260e7ec Updated console and methods connecting to it by Trinh Tong 2018-10-22 12:12:13 -0400
  • 1f1b2ca Updated console and methods connecting to it by Trinh Tong 2018-10-22 12:09:41 -0400
  • 90ad91b fixed merging conflict by Trinh Tong 2018-10-22 11:26:06 -0400
  • ef4bf7b Fixed merge conflict by Trinh Tong 2018-10-22 11:21:18 -0400
  • 7ef139a Updated memory methods by Trinh Tong 2018-10-22 11:02:45 -0400
  • cc2a9c2 Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 15:02:15 +0000
  • 0ab5b28 (refs/pull/5/head) updated methods with return statements by Lauren Green 2018-10-22 10:59:37 -0400
  • 811c55c Updated return values for methods by Trinh Tong 2018-10-22 10:48:01 -0400
  • c3f9897 Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 12:39:57 +0000
  • d67c5f1 (refs/pull/4/head) merge changes by Lauren Green 2018-10-22 08:39:25 -0400
  • 5b0bd69 fixed merged conflict by Trinh Tong 2018-10-22 08:23:41 -0400
  • 54331f2 Updated methods by Trinh Tong 2018-10-22 08:11:44 -0400
  • 38e751a (refs/pull/3/head) changed each operation to seperate methods by Lauren Green 2018-10-22 08:11:12 -0400
  • 017503a Updated methods by Trinh Tong 2018-10-21 21:49:33 -0400
  • a8b6847 Updated methods by Trinh Tong 2018-10-21 21:49:01 -0400
  • bb2de36 Updated methods by Trinh Tong 2018-10-21 21:08:12 -0400
  • 2a95b38 Updated Main Menu by Trinh Tong 2018-10-21 19:49:02 -0400
  • a446339 Tested and updated methods by Trinh Tong 2018-10-21 18:45:21 -0400
  • 0ac93ed Tested and updated methods by Trinh Tong 2018-10-21 18:43:31 -0400
  • f27a521 Tested and updated methods by Trinh Tong 2018-10-21 18:29:39 -0400
  • ad1a9d4 updated print to console and added error for div by 0 by Lauren Green 2018-10-21 17:03:59 -0400
  • 93a7558 Commiting by Lauren Green 2018-10-21 16:39:20 -0400
  • b73609b testing commit by Trinh Tong 2018-10-20 19:25:29 -0400
  • 6c18622 Fixed Merge Conflic by Trinh Tong 2018-10-20 19:10:34 -0400
  • 2c0c48c Added Main Menu Class by Trinh Tong 2018-10-20 18:57:13 -0400
  • 05fcb1b Added Main Menu Class by Trinh Tong 2018-10-20 18:56:59 -0400
  • 20bfa56 updated switchdisplay methods by Trinh Tong 2018-10-20 18:46:46 -0400
  • 03ea527 Updated Switch Display methods by Trinh Tong 2018-10-20 18:37:29 -0400
  • cf37109 Console.print updates by Lauren Green 2018-10-20 12:46:55 -0400
  • 0e4e9b3 Added methods and separated classes by Trinh Tong 2018-10-20 11:35:13 -0400
  • ed5bc86 Broke down menu to methods by Trinh Tong 2018-10-20 11:22:38 -0400
  • 90f6a24 Separated memory methods by Trinh Tong 2018-10-20 11:10:01 -0400
  • 9a5ed04 Added comments to scicalc by Trinh Tong 2018-10-20 11:00:47 -0400
  • 0402e64 Ignore DS store. by Trinh Tong 2018-10-20 10:59:00 -0400
  • c106742 Update scientific calculator. by Trinh Tong 2018-10-20 10:56:34 -0400
  • b6296f1 updated methods by Trinh Tong 2018-10-20 10:15:04 -0400
  • d685dce updated methods by Trinh Tong 2018-10-19 18:04:44 -0400
  • 92b2a51 Updated methods in SciCalc by Trinh Tong 2018-10-19 18:02:20 -0400
  • 9e70366 Updated java files by Trinh Tong 2018-10-19 17:48:11 -0400
  • 655c41d Fixed java files by Trinh Tong 2018-10-19 17:47:40 -0400
  • c5c1b19 Deleted Duplicate and renamed file by Trinh Tong 2018-10-19 17:38:26 -0400
  • 493788d Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-19 21:22:20 +0000
  • 084f5e5 (refs/pull/2/head) fixed merge conflicts by Lauren Green 2018-10-19 17:21:46 -0400
  • 40823d2 Fixing merge conflict by Trinh Tong 2018-10-19 17:11:44 -0400
  • 2f8a5cb Added Basic Functions by Lauren Green 2018-10-19 17:11:33 -0400
  • 0843dc6 Updating methods for adv by Trinh Tong 2018-10-19 16:57:08 -0400
  • c75899f rewriting lost code.. by Trinh Tong 2018-10-19 16:56:16 -0400
  • 5a10020 Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-19 20:33:55 +0000
  • 6b61ce7 Updated baseOption methods by Trinh Tong 2018-10-19 16:29:59 -0400
  • 7849e25 (refs/pull/1/head) Trig Class w/Methods added by Lauren Green 2018-10-19 16:26:43 -0400
  • 66099ca Updated memory methods by Trinh Tong 2018-10-19 16:12:39 -0400
  • bd29920 Added plans to the ADVCALC by Trinh Tong 2018-10-19 15:41:49 -0400
  • d174603 Added plans to the ADVCALC by Trinh Tong 2018-10-19 15:40:35 -0400
  • 23b4dae Update 'README.md' by nhu313 2018-10-18 13:30:00 +0000
  • 87fe8b1 Update 'README.md' by Kristofer Younger 2018-05-25 18:08:04 +0000
  • cdab20c Convert to BlueJ by Nhu Nguyen 2018-05-18 10:52:22 -0400
  • 190b4c5 Update README.md by Git-Leon 2018-02-10 17:40:21 -0500
  • 4155985 read me by Stephen P 2018-02-09 14:51:34 -0500
  • 4fa90fd added more project structure by Leon 2018-02-09 14:25:04 -0500
  • 807ed78 removed ignored files by Leon 2018-02-09 14:24:15 -0500
  • c86081a added .gitignore by Leon 2018-02-09 14:23:51 -0500
  • 6e8ff46 added project structure by Leon 2018-02-09 14:23:14 -0500
  • 113224d Update README.md by Git-Leon 2017-10-23 17:01:05 -0400
  • 08141b3 Update README.md by Git-Leon 2017-10-17 21:09:16 -0400
  • 773755e Update README.md by Git-Leon 2017-10-13 14:43:40 -0400
  • a54d568 Update README.md by Git-Leon 2017-10-02 15:26:12 -0400
  • b207cf4 Update README.md by Git-Leon 2017-09-22 09:19:52 -0400
  • 7a58ad7 Added submission instructions by David Ginzberg 2016-04-29 00:29:44 -0400
  • 58d04ce Upload calculator Requirements by David Ginzberg 2016-04-29 00:17:04 -0400