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

Jk feb8 #23

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

Jk feb8 #23

wants to merge 82 commits into from

Conversation

jessicakilby
Copy link

ConstantsTests finally all passing. Made some minor changes in Program.cs and Constants.cs and no merge conflicts when I opened a pull request.

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
utleroy and others added 30 commits February 4, 2017 18:42
@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 updating constant logic
1d3fc5f
@tayloraharry
Merge pull request #26 from tayloraharry/th-feb06b
c74d72a 
added updating constant logic
@tayloraharry
added stacks for math problems/solutions and added constant logic to …
998bed1 
…ignore case sensitivty
@tayloraharry
Merge pull request #27 from tayloraharry/th-feb06c
fd2f2ac 
added stacks for math problems/solutions and added constant logic to …
@utleroy
updated counter
5377832
@utleroy
Merge pull request #28 from tayloraharry/lh-feb-6
4554b54 
updated counter
@sward42
add mathStackTests
f38aced
@tayloraharry
added colors to program
4267be3
@jessicakilby
constants tests
3d5c6a0
@jessicakilby
Merge pull request #30 from tayloraharry/jk-feb6
276d5ac 
constants tests
@utleroy
Merge pull request #29 from tayloraharry/th-feb06h
84bf57b 
added colors to program
@sward42
complete mathProblemTests
6140245
@sward42
fix conflicts
43f021d
@sward42
Merge branch 'master' into sw-calc-feb_6
9b3e9df
@sward42
fixed merge conflicts
1f3775c
@sward42
fix merge conflict
896fd17
@sward42
Merge pull request #31 from tayloraharry/sw-calc-feb_6
b1b68ee 
Sw calc feb 6
@tayloraharry
added lower/upper constant logic and fixed timer exit issue
6087693
@tayloraharry
Merge pull request #32 from tayloraharry/th-feb07b
fb963d9 
added lower/upper constant logic and fixed timer exit issue
@tayloraharry
constant case sensitivity ignored
4e4e58e
@tayloraharry
added color changes to console app
f52e094
@tayloraharry
Merge pull request #33 from tayloraharry/th-feb07-colorfix
2cd6115 
added color changes to console app
@jessicakilby
all but one constant test passing
4c9318c
@jessicakilby
ConstantsTests all passing
f0be08a
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
@jessicakilby @tayloraharry @utleroy @sward42 @blairvansant