Eric Foster
|
0830c0a503
|
added www file to gitignore
|
6 years ago |
Eric Foster
|
77076eb64f
|
fixed merge conflicts with dev
|
6 years ago |
Eric Foster
|
473adcce6f
|
merge with dev fixing conflicts
|
6 years ago |
Eric Foster
|
a77d07320c
|
asdF'
|
6 years ago |
Eric Foster
|
eb28fbd3a3
|
api clean up, added lombok getter and setter, get transactions by public key
|
6 years ago |
Eric Foster
|
046532c835
|
updated transaction and wallet controller, service, and repository
|
6 years ago |
Eric Foster
|
0a0c65fae1
|
cleaned up spaces in loader files
|
6 years ago |
Eric Foster
|
3a7da10f26
|
build files
|
6 years ago |
Eric Foster
|
6fb5b43295
|
build files
|
6 years ago |
Eric Foster
|
ceba7dcdc9
|
build files
|
6 years ago |
Eric Foster
|
381292ea63
|
build files
|
6 years ago |
Shivam Patel
|
4a69e031c9
|
ok
|
6 years ago |
Shivam Patel
|
ef0f3805eb
|
ufefhweMerge branch 'dev' of https://git.zipcode.rocks/shiv-365/ZipCoin-RED into dev
|
6 years ago |
Shivam Patel
|
c02442698c
|
girhgieao
|
6 years ago |
Shivam Patel
|
c2f19e9c2c
|
orkingw
|
6 years ago |
Khalil Malik Saboor
|
52843bbf09
|
removed nested .idea and removed target folders
|
6 years ago |
Khalil Malik Saboor
|
4faf17a6b0
|
deleted ds store, idea folders and client 2.0
|
6 years ago |
Khalil Malik Saboor
|
619e4f0c60
|
deleted .idea from src
|
6 years ago |
Eric Foster
|
1d856f36d4
|
apis tested
|
6 years ago |
Khalil Malik Saboor
|
02270c161d
|
MerkelTree
|
6 years ago |
Khalil Malik Saboor
|
186d07f0cb
|
Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/ZipCoin-RED into button
|
6 years ago |
Khalil Malik Saboor
|
f62de6b96d
|
a
|
6 years ago |
Khalil Malik Saboor
|
e70d71b428
|
ok
|
6 years ago |
Shivam Patel
|
8b1e22a5a0
|
ignore this
|
6 years ago |
Shivam Patel
|
cf9f0d7b13
|
maven
|
6 years ago |
Shivam Patel
|
2651e115d1
|
main
|
6 years ago |
Shivam Patel
|
0054066738
|
main
|
6 years ago |
Eric Foster
|
b891d7d804
|
transaction list, block list, and removed payment from dropdown
|
6 years ago |
Eric Foster
|
cb407969c3
|
fixed spelling of recipient
|
6 years ago |
Eric Foster
|
1935abb439
|
mainjsbuild
|
6 years ago |
Eric Foster
|
7d159b1fff
|
gitgnore workspacexml
|
6 years ago |
Eric Foster
|
a75a299aad
|
build folder
|
6 years ago |
Eric Foster
|
eb2d9b2326
|
added gitignore to www folder
|
6 years ago |
Eric Foster
|
da41f7a7ff
|
git ignore idea folder
|
6 years ago |
Aleena Rose-Mathew
|
ddbad1e6a0
|
wallet loader
|
6 years ago |
Aleena Rose-Mathew
|
2cb2a5d1fe
|
ok
|
6 years ago |
Aleena Rose-Mathew
|
c5af445008
|
wallet loader
|
6 years ago |
Aleena Rose-Mathew
|
4526155930
|
Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/ZipCoin-RED into wallet2
wihdlwk# especially if it merges an updated upstream into a topic branch.
|
6 years ago |
Eric Foster
|
5e26e88444
|
rebuilt maven project
|
6 years ago |
Eric Foster
|
2c2d1e1d23
|
switching to dev branch
|
6 years ago |
Eric Foster
|
487e4b504f
|
build files
|
6 years ago |
Eric Foster
|
907cf237f6
|
idea and iml files
|
6 years ago |
Eric Foster
|
cbe9b2966f
|
merging with transaction list
|
6 years ago |
Navya Sanal
|
6f8a41d8a6
|
conflics
|
6 years ago |
Eric Foster
|
2de039e93c
|
asdf
|
6 years ago |
Eric Foster
|
b83fa2acae
|
Merge branch 'dev' of https://git.zipcode.rocks/shiv-365/ZipCoin-RED into dev
|
6 years ago |
Eric Foster
|
55094f943d
|
workspacexml
|
6 years ago |
Navya Sanal
|
026721cab6
|
build files
|
6 years ago |
Navya Sanal
|
fac06a3d0a
|
wallet server commit
|
6 years ago |
Arin Turpin
|
5793360dd7
|
resolve conflicts
|
6 years ago |