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

Development #25

Merged
merged 18 commits into from
Nov 3, 2017
Merged

Development #25

merged 18 commits into from
Nov 3, 2017

Conversation

elementfrvr
Copy link
Collaborator

No description provided.

avatar4444 and others added 18 commits October 31, 2017 22:23
@avatar4444
Added Income types and other inputs to Income Activity
55e813b
@avatar4444
Added working Main menu and Clear button to AddIncome activity
69c9881
@avatar4444
Added Buttons and toast status to Expense and Income
2c9ba9c
@iantodd96
Financial Health status now generates upon opening main activity.
08e1a0b
@iantodd96
Financial Health status now generates upon opening main activity.
02e0c37
@avatar4444
Minor change to blank text fields made then unclickable
71bf70c
@avatar4444
test
7e35f4f
@iantodd96
Added a method to refresh the ListView
3d50dd7
@iantodd96
Forgot to stage all changes
56ee7dc
@elementfrvr
Merge branch 'development' into Avtar-Test2
58a99ac
@iantodd96
This should push the changes correctly
26c39c7
@elementfrvr
Merge remote-tracking branch 'origin/development' into Avtar-Test2
81a0917
@iantodd96
SPRINT 1 COMPLETE, PUSH ME TO DEVELOPMENT BRANCH
49471cd
@iantodd96
Merge remote-tracking branch 'origin/Avtar-Test2' into Avtar-Test2
f72001c
@iantodd96
Fixes
9964196
@elementfrvr
Fixed tabbing and removed garbage code
e898716
@elementfrvr
Final Fixes
a2b2096 
Readdded code to onclick listeners
@elementfrvr
Merge pull request #23 from SIU-CS/SprintONe
a1d200a 
Sprint one
iantodd96
iantodd96 approved these changes Nov 3, 2017
View reviewed changes
Copy link
Contributor

@iantodd96 iantodd96 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine, approving changes.

@elementfrvr elementfrvr merged commit 63ec6a9 into master Nov 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iantodd96 iantodd96 iantodd96 approved these changes

@avatar4444 avatar4444 Awaiting requested review from avatar4444

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@elementfrvr @iantodd96 @avatar4444