Commit graph

8c920c9 (refs/pull/38/head) removed from repo by Zavon Malone 2018-11-20 13:36:17 -0500
f90d64e fix by Zavon Malone 2018-11-20 13:35:50 -0500
882ea0f change url by Zavon Malone 2018-11-20 12:25:35 -0500
d6116b0 (refs/pull/36/head) done by Xcuello 2018-11-20 10:58:01 -0500
0478fd4 (refs/pull/35/head) d by Stwillia94 2018-11-19 15:16:34 -0500
6030481 (refs/pull/34/head) group Project by Nuridalia.Hernandez 2018-11-17 17:09:08 -0500
2aae864 (refs/pull/32/head) Group Project by NiraParikh 2018-11-15 13:36:36 -0500
04c1025 (refs/pull/31/head) completed by Chaitali Patel 2018-11-15 13:18:52 -0500
4faaaaa (refs/pull/2/head) Completed version by Chaitali Patel 2018-11-13 13:00:43 -0500
89f59c4 Completed version by Chaitali Patel 2018-11-13 12:57:50 -0500
74e253b (refs/pull/30/head) Calculator by Soujanya Buragapu 2018-11-10 23:30:47 -0500
1fc7abe (refs/pull/29/head) completed by Jevit Tith 2018-11-09 16:08:36 -0500
635b8c5 update by Whitney Martinez 2018-11-06 09:22:16 -0500
e3214e9 update by Whitney Martinez 2018-11-06 09:21:26 -0500
972bd2a (refs/pull/28/head) completed Sci Calculator Lab - copied from team member Saurav by Christian Sheridan 2018-11-01 18:43:10 -0400
d941ea3 (refs/pull/27/head) Calculator Stuff by Akeem Cherry 2018-11-01 17:47:07 -0400
b14cbc2 (refs/pull/26/head) commited by Yesoda Sanka 2018-10-31 23:22:21 -0400
7077551 comitted by Yesoda Sanka 2018-10-31 13:53:05 -0400
3a757d1 (refs/pull/25/head) Main Calculator sample by Elliott Stansbury 2018-10-30 23:16:35 -0400
014853c (refs/pull/24/head) to my url by nicholassatinover 2018-10-30 15:06:15 -0400
f9c8621 (refs/pull/20/head) trying to push by nicholassatinover 2018-10-30 09:08:28 -0400
c23847d trying to push by nicholassatinover 2018-10-29 19:14:42 -0400
353be32 Didn't commit own push before - no changes from group project by nicholassatinover 2018-10-29 19:13:15 -0400
a1fd4c3 Group Project by NiraParikh 2018-10-28 23:41:42 -0400
d97080d (refs/pull/23/head) finished by Jarrett Samuels 2018-10-25 23:04:33 -0400
31e1959 ScientificCalculator by Zavon Malone 2018-10-25 15:34:37 -0400
d46759d (refs/pull/33/head) adding it anyway by Jose Bedolla 2018-10-23 15:05:42 -0400
34b2cca here are the changes sry by Whitney Martinez 2018-10-23 12:37:36 -0400
37dc4f4 Changes to the functions by Chaitali Patel 2018-10-22 23:01:26 -0400
5108421 (refs/pull/18/head) Thunderdome's Calculator by Trinh Tong 2018-10-22 20:56:00 -0400
6bfd366 Thunderdome's Calculator by Trinh Tong 2018-10-22 20:54:32 -0400
b5739d1 (refs/pull/17/head) copied from trunk. by William Brown 2018-10-22 20:41:56 -0400
4dc67e1 (refs/pull/37/head) Completed by Jacob Andersen 2018-10-22 19:58:32 -0400
528c716 (refs/pull/16/head) Final Change by Brandon Defrancis 2018-10-22 18:42:34 -0400
c97b441 (refs/pull/22/head, refs/pull/14/head) calc by Kate Moore 2018-10-22 18:36:39 -0400
f1ddd71 (refs/pull/19/head) {UltraPlusSchwing Lab} by Jacqueline Joson 2018-10-22 18:28:27 -0400
387e057 blah by Jacob Andersen 2018-10-22 18:24:44 -0400
c71f2d8 Curtis Cook's Scientific Calculator Lab by Curtis Cook 2018-10-22 18:21:49 -0400
6de42c6 . by Jacob Andersen 2018-10-22 18:17:33 -0400
4cb8748 (refs/pull/12/head) final by Seth 2018-10-22 18:05:21 -0400
3e11aee (refs/pull/11/head) readme2.md by mpierse 2018-10-22 22:05:00 +0000
936a45b (refs/pull/10/head) DEMO CALC by Nathan Hall 2018-10-22 18:03:32 -0400
7f44470 final copy by Margaret Pierse 2018-10-22 18:03:10 -0400
5b8b633 slight change to display in legend. added test classes for bonus and trig functs. by Demetrius Murray 2018-10-22 17:59:07 -0400
da6a659 (refs/pull/13/head) Update 'DisplayVal.java' by Connor Dunnigan 2018-10-22 21:55:51 +0000
1e09af6 this calculator works by Margaret Pierse 2018-10-22 17:54:19 -0400
555b8fe final by Connor 2018-10-22 17:52:53 -0400
b25a372 (refs/pull/3/head) firstCommit by William Brown 2018-10-22 17:36:19 -0400
dd55cf5 now the message shows up by Whitney Martinez 2018-10-22 17:33:16 -0400
5cb2431 (refs/pull/8/head) Thulasi has the code for our group (Thulasi, Thuy, Jenn C) by Jennifer Chao 2018-10-22 17:29:51 -0400
1e37e8f Trying something by William Brown 2018-10-22 17:25:24 -0400
35012a6 (refs/pull/9/head) Merge branch 'master' of https://git.zipcode.rocks/thulasipuppala/ZCW-MacroLabs-OOP-ScientificCalculator by ThuyKhong 2018-10-22 17:25:18 -0400
e764e50 almost done by Connor 2018-10-22 17:23:05 -0400
615d779 Merge branch 'master' of nedredmond/ZCW-MacroLabs-OOP-ScientificCalculator into master by William Brown 2018-10-22 21:15:48 +0000
b4f7404 (refs/pull/4/head) made some changes by thulasi 2018-10-22 17:13:54 -0400
18501e8 (refs/pull/5/head) Fixed Memory Method by Trinh Tong 2018-10-22 17:10:11 -0400
6615885 (refs/pull/15/head) merged pemdas by Jonathan Hinds 2018-10-22 16:23:05 -0400
3af3121 clear func by Connor 2018-10-22 16:19:40 -0400
14b4ea7 easter egg by NedRedmond 2018-10-22 16:08:31 -0400
b8d0139 changes by Brandon Defrancis 2018-10-22 16:01:31 -0400
375eeed easter egg by NedRedmond 2018-10-22 15:58:35 -0400
0bbaaae IT WORKS by Whitney Martinez 2018-10-22 15:55:51 -0400
434b97f (refs/pull/6/head) Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:54:15 +0000
bd9cb08 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
c82de56 Change 2 by Brandon Defrancis 2018-10-22 15:50:55 -0400
79238f4 Added testing for baseOptions by Trinh Tong 2018-10-22 15:49:14 -0400
9b8d426 second merge by Seth 2018-10-22 15:48:55 -0400
a54e266 Merge branch 'master' of nedredmond/ZCW-MacroLabs-OOP-ScientificCalculator into master by William Brown 2018-10-22 19:47:19 +0000
79db949 just making sure by NedRedmond 2018-10-22 15:46:27 -0400
5dc65a8 (refs/pull/7/head) done by De'Jon Johnson 2018-10-22 15:45:29 -0400
b807549 added Nates changes by Margaret Pierse 2018-10-22 15:45:25 -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
cbc8d31 Curtis Cook's commits by Curtis Cook 2018-10-22 15:42:49 -0400
657e4f4 more updates by Connor 2018-10-22 15:39:46 -0400
34a13fe Merge branch 'master' of ElliottStansbury/ZCW-MacroLabs-OOP-ScientificCalculator into master by jonathan-hinds 2018-10-22 19:39:03 +0000
c4d9abf added factorial method by Michelle DiMarino 2018-10-22 15:38:30 -0400
989c244 Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-MacroLabs-OOP-ScientificCalculator by Elliott Stansbury 2018-10-22 15:38:08 -0400
d09b271 merged and working by Demetrius Murray 2018-10-22 15:34:06 -0400
7a3ebdb BEGONE by nedredmond 2018-10-22 19:32:23 +0000
a5df582 added pemdas method to calculations by Jonathan Hinds 2018-10-22 15:31:56 -0400
a7129da very minor edits by Margaret Pierse 2018-10-22 15:30:25 -0400
4f01b86 Added division, subtraction, addition.. getNumber() by Elliott Stansbury 2018-10-22 15:28:42 -0400
a0c0605 Added rounding by Nathan Hall 2018-10-22 15:26:43 -0400
84745a6 Merge branch 'master' of nedredmond/ZCW-MacroLabs-OOP-ScientificCalculator into master by William Brown 2018-10-22 19:24:47 +0000
6243ca6 Merge branch 'master' of WJB3003/ZCW-MacroLabs-OOP-ScientificCalculator into master by William Brown 2018-10-22 19:24:38 +0000
0172fac cast to int for factorial in main by Demetrius Murray 2018-10-22 15:24:05 -0400
60443a8 bonus, trig by Nicholas Satinover 2018-10-22 15:22:44 -0400
6657782 checkpoint to pull by Demetrius Murray 2018-10-22 15:22:11 -0400
1d0dda4 Added advanced math functions by NedRedmond 2018-10-22 15:21:53 -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 merge conflict resolved by Michelle DiMarino 2018-10-22 15:19:45 -0400
bd7dd3e Check in before demo by Demetrius Murray 2018-10-22 15:15:59 -0400
e18dd70 Merge branch 'master' of laurengreen/ZCW-MacroLabs-OOP-ScientificCalculator into master by trtong 2018-10-22 19:15:11 +0000
bd40934 fixed merge conflicts by Lauren Green 2018-10-22 15:15:00 -0400
a16a0fd TrigFunctions by Zavon Malone 2018-10-22 15:13:47 -0400
2afa666 TrigFunctions by Zavon Malone 2018-10-22 15:12:08 -0400