Skip to content

Kai #24

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

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

Kai #24

Changes from 3 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
537a90a
add classes
kendrang Oct 26, 2019
f9aa639
added Users Skeleton
Oct 26, 2019
1fece66
added balance method to User class
Oct 26, 2019
c51e00f
did stuff in main
kendrang Oct 26, 2019
7aba45a
merging with kai
kendrang Oct 26, 2019
38ebcc1
worked on main functions more
kendrang Oct 26, 2019
c07b418
drafted account and transactions classes
Oct 26, 2019
e5a0525
added a couple comments and changed a bit of formatting
Oct 26, 2019
8eaaa70
Merge pull request #1 from jackaharrisii/jack
kshields412 Oct 27, 2019
ba036c6
Merge pull request #2 from jackaharrisii/jack
kshields412 Oct 27, 2019
c2db134
added the ascii art
Oct 27, 2019
fae608a
Merge pull request #3 from jackaharrisii/jack
kshields412 Oct 27, 2019
3e4151c
cleaned up the pin menu and framed out some other menus
kendrang Oct 27, 2019
04ebbd1
merged jacks branch
Oct 27, 2019
af1bc45
Merge pull request #4 from kshields412/kai
kendrang Oct 27, 2019
63c91ae
Merge pull request #5 from kendrang/kendra
kshields412 Oct 27, 2019
a733f36
have the skeleton of the transactions menu 90% done
kendrang Oct 27, 2019
3ac8359
successfully tested acct creation and deposit
Oct 27, 2019
17220d2
Merge pull request #6 from jackaharrisii/jack
kshields412 Oct 27, 2019
574ebf2
Merge branch 'kai' into jack
kshields412 Oct 27, 2019
8b660b6
Merge pull request #7 from kshields412/jack
kshields412 Oct 27, 2019
cca16b4
finished all the transactions, accounts, and associated tests
Oct 28, 2019
690c95b
checkpoint kai
Oct 28, 2019
ab22427
Merge pull request #1 from kshields412/dev
jackaharrisii Oct 30, 2019
7b937a8
Merge pull request #8 from jackaharrisii/jack
kshields412 Oct 30, 2019
138ad0c
checkpoint before merge
kendrang Oct 30, 2019
a9f6277
got jacks stuff
kendrang Oct 30, 2019
9e204e0
Merge pull request #9 from kendrang/kendra
kshields412 Oct 30, 2019
c9457b5
figured some stuff out
kendrang Oct 30, 2019
1b7e939
pulling from kendra
Oct 30, 2019
b303559
checkpoint
Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.