Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Th feb06 #18

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Th feb06 #18

wants to merge 60 commits into from

Conversation

tayloraharry
Copy link

No description provided.

jessicakilby and others added 30 commits February 1, 2017 18:04
@jessicakilby
unit test and other files setup
378f804
@tayloraharry
added regex to verify user math problem is accurate
09b7201
@jessicakilby
more files
c0fb80a
@tayloraharry
Merge pull request #1 from tayloraharry/th-jan_31
8f660ba 
added regex to verify user math problem is accurate
@jessicakilby
Merge pull request #2 from tayloraharry/jk-feb1
0e1268c 
Jk feb1
@tayloraharry
added bug fix to regex in program file
19c69d2
@tayloraharry
Merge pull request #3 from tayloraharry/th-feb_01
1b0bbcd 
added bug fix to regex in program file
@jessicakilby
added division
c93e7de
@jessicakilby
Merge pull request #4 from tayloraharry/jk-wed
9890ad9 
added division
@tayloraharry
added expression class to handle regexpression by user
09492b8
@jessicakilby
division files
5ed2df5
@jessicakilby
Merge pull request #5 from tayloraharry/jk-wed
2e8d749 
division files
@tayloraharry
added expression class to handle regexpression by user
72033d2
@tayloraharry
Merge pull request #6 from tayloraharry/th-feb_01_2.0
5358ddf 
Th feb 01 2.0
@utleroy
if statemnet in projectCS
5cb0167
@utleroy
swith statement implimented for operator selection
e0ffaa0
@tayloraharry
fixed regular expression issue
249ac4d
@tayloraharry
Merge pull request #7 from tayloraharry/th-feb_04
d1ea51e 
fixed regular expression issue
@jessicakilby
Multiplication and Subtraction with passing tests
faffe24
@utleroy
counter++ working and program continues running
93e29eb
@utleroy
Merge branch 'master' of github.com:tayloraharry/group-exercise-simpl…
ea67244 
…e-calculator
@utleroy
Merge pull request #8 from tayloraharry/lh-feb-3
f8da104 
Counter working and program reruns on enter
@jessicakilby
Merge pull request #9 from tayloraharry/jk-wed
e9d35df 
Multiplication and Subtraction with passing tests
@utleroy
Merge branch 'master' of github.com:tayloraharry/group-exercise-simpl…
c436953 
…e-calculator
@jessicakilby
changes mult and sub
486216c
@jessicakilby
made more changes to subt and mult
95c6362
@jessicakilby
Merge pull request #10 from tayloraharry/jk-wed
fe07d8d 
Jk wed
@sward42
change division class to decimal
800101b
@sward42
Merge pull request #11 from tayloraharry/sw-calc-feb_1
7f5b933 
change division class to decimal
@utleroy
Merge branch 'master' of github.com:tayloraharry/group-exercise-simpl…
1b3bc01 
…e-calculator
blairvansant and others added 30 commits February 4, 2017 11:33
@blairvansant
modulus method works and test passes
defa808
@blairvansant
Merge pull request #12 from tayloraharry/feb_4
c3056cf 
modulus method works and test passes
@tayloraharry
added switch statement logic
6989fd6
@tayloraharry
Merge pull request #13 from tayloraharry/th-feb04b
bbe7e7b 
added switch statement logic
@utleroy
Merge branch 'master' of github.com:tayloraharry/group-exercise-simpl…
75dbca5 
…e-calculator
@tayloraharry
fixed regular expression and exiting strategy
817a536
@tayloraharry
Merge pull request #14 from tayloraharry/th-feb04c
99c291b 
fixed regular expression and exiting strategy
@utleroy
add get last value functionality
906f04c
@utleroy
Merge pull request #15 from tayloraharry/lh-feb-4
2a5fcb8 
added "get last line" functionality
@sward42
fix test errors
688b613
@sward42
Merge pull request #16 from tayloraharry/sw-calc-feb_4
8eae5fa 
fix test errors
@utleroy
changed decimal to double in divide test
19c3262
@utleroy
Merge pull request #17 from tayloraharry/lh-feb-4
5ec2133 
changed decimal to double in divide test
@blairvansant
implement modulus to program
ca6a230
@blairvansant
Merge pull request #18 from tayloraharry/bv_feb_4
f138105 
implement modulus to program
@blairvansant
decimal to double
cf0f86e
@blairvansant
Merge pull request #19 from tayloraharry/bv_feb_4
e1f4126 
decimal to double
@tayloraharry
updated prgram file
61cbf0b
@tayloraharry
Merge pull request #20 from tayloraharry/th-feb04f
f2ae6c8 
updated prgram file
@blairvansant
fix modulus
61c1b45
@blairvansant
Merge pull request #21 from tayloraharry/bv_feb_4
85f4eab 
fix modulus
@utleroy
added up arrow functionality to cycle through previous entries
6f43c71
@utleroy
Merge pull request #22 from tayloraharry/lh-feb-4
e776d81 
added up arrow functionality to cycle through previous entries
@utleroy
added a pause to display bye for 4 seconds before exit
e501b6b
@utleroy
added countdown display
795214c
@tayloraharry
added constant logic to console application
8d940d5
@utleroy
Merge pull request #24 from tayloraharry/lh-feb-6
ef80192 
added countdown display
@tayloraharry
Merge pull request #25 from tayloraharry/th-feb06
b70d51f 
added constant logic to console application
@tayloraharry
added constant logic to console application
57ff9b8
@tayloraharry
Merge remote-tracking branch 'origin' into th-feb06
8f212a3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tayloraharry @jessicakilby @utleroy @sward42 @blairvansant