0000000000000000000000000000000000000000 a2b980009e3d0b66c499569167b06a7ada7b8bef Thomas Bocek <tom@tomp2p.net> 1401112545 +0200	
a2b980009e3d0b66c499569167b06a7ada7b8bef dd70fcc943bd5ad2ea5d0ce4b3e59119fbec7a37 Thomas Bocek <tom@tomp2p.net> 1401112566 +0200	checkout: moving from master to develop-sk
dd70fcc943bd5ad2ea5d0ce4b3e59119fbec7a37 479bc073b27fbdd40c7a184bd5888e3d93aee62c Thomas Bocek <tom@tomp2p.net> 1401265980 +0200	merge branch 'develop-sk' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
479bc073b27fbdd40c7a184bd5888e3d93aee62c b744dec5322798e61b78b924386707fa59014e0b Thomas Bocek <tom@tomp2p.net> 1401266035 +0200	commit: added source and test directory to not configure it manually
b744dec5322798e61b78b924386707fa59014e0b 50347af83b2aa226697bd8a6fe25bd81a9aef35c Thomas Bocek <tom@tomp2p.net> 1402064691 +0200	merge branch 'develop-sk' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
50347af83b2aa226697bd8a6fe25bd81a9aef35c a2b980009e3d0b66c499569167b06a7ada7b8bef Thomas Bocek <tom@tomp2p.net> 1402903953 +0200	checkout: moving from develop-sk to master
a2b980009e3d0b66c499569167b06a7ada7b8bef 57ebcc9cd1e4ba62b1a74981b138bba3508f8485 Thomas Bocek <tom@tomp2p.net> 1402903961 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
57ebcc9cd1e4ba62b1a74981b138bba3508f8485 32159575ad85359a4036b0e4e598c7a1fae1d786 Thomas Bocek <tom@tomp2p.net> 1404651033 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
32159575ad85359a4036b0e4e598c7a1fae1d786 42dcec53f5015773deb0dda923eaeb2982321a47 Thomas Bocek <tom@tomp2p.net> 1404812221 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
42dcec53f5015773deb0dda923eaeb2982321a47 ab2ae415c6139abbda78c4ccbf35d8f56c2316f0 Thomas Bocek <tom@tomp2p.net> 1405342116 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
ab2ae415c6139abbda78c4ccbf35d8f56c2316f0 99e8edf9c28ce9251b0a35bfc1b4151b6ea0582c Thomas Bocek <tom@tomp2p.net> 1405410298 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
99e8edf9c28ce9251b0a35bfc1b4151b6ea0582c 1ff537a1ada2b4c2d93f66681f5123350e55b429 Thomas Bocek <tom@tomp2p.net> 1406733695 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
1ff537a1ada2b4c2d93f66681f5123350e55b429 7d681e347cb0734bd1f03edd0d0d3710f8c44e1b Thomas Bocek <tom@tomp2p.net> 1406795054 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
7d681e347cb0734bd1f03edd0d0d3710f8c44e1b c58270ac3ac6e19be82ffae91aa76687a99213bb Thomas Bocek <tom@tomp2p.net> 1408114336 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
c58270ac3ac6e19be82ffae91aa76687a99213bb c58ee55ed0c6405822094c87fdf322367138f987 Thomas Bocek <tom@tomp2p.net> 1408559008 +0200	commit: permornace enhancements
c58ee55ed0c6405822094c87fdf322367138f987 c208524687a717a9fa5bf696f429a61d9a98d2aa Thomas Bocek <tom@tomp2p.net> 1408965000 +0200	commit: working version
c208524687a717a9fa5bf696f429a61d9a98d2aa 8244e7913a1f81027961edbd1e50efa684b697ff Thomas Bocek <tom@tomp2p.net> 1408965306 +0200	commit: working version
8244e7913a1f81027961edbd1e50efa684b697ff 4b1686cb8f9ab14f884eb065475134ad82dc5890 Thomas Bocek <tom@tomp2p.net> 1408965328 +0200	checkout: moving from master to 4b1686cb8f9ab14f884eb065475134ad82dc5890
4b1686cb8f9ab14f884eb065475134ad82dc5890 ea72aecac3db70f55f8610dfc54f55f4bb659d8d Thomas Bocek <tom@tomp2p.net> 1408965328 +0200	rebase: working version
ea72aecac3db70f55f8610dfc54f55f4bb659d8d 49b3dfb98c90f12eb5d6d01cec52b1dcf941aba5 Thomas Bocek <tom@tomp2p.net> 1408965376 +0200	commit: working version
49b3dfb98c90f12eb5d6d01cec52b1dcf941aba5 49b3dfb98c90f12eb5d6d01cec52b1dcf941aba5 Thomas Bocek <tom@tomp2p.net> 1408965376 +0200	rebase finished: returning to refs/heads/master
49b3dfb98c90f12eb5d6d01cec52b1dcf941aba5 d92797ff5eb2bba0df26f27f811ca24609d66aba Thomas Bocek <tom@tomp2p.net> 1408981063 +0200	commit: fixed bugs
d92797ff5eb2bba0df26f27f811ca24609d66aba 3e2b3155611fddfbffd0aa02b86841b145e4842c Thomas Bocek <tom@tomp2p.net> 1408981417 +0200	commit: Merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git
3e2b3155611fddfbffd0aa02b86841b145e4842c 68daeaaa4635ccec648514b779c2f1026168eebf Thomas Bocek <tom@tomp2p.net> 1408981532 +0200	commit: reverted to Jetons version
68daeaaa4635ccec648514b779c2f1026168eebf 3d1db4fc52d8de74bfea195ef06460dee568b05d Thomas Bocek <tom@tomp2p.net> 1408981585 +0200	commit: added controller
3d1db4fc52d8de74bfea195ef06460dee568b05d a708519fed6e44b83cc1e3457e95cd80ce850565 Thomas Bocek <tom@tomp2p.net> 1408982784 +0200	commit: removed unused dependencies
a708519fed6e44b83cc1e3457e95cd80ce850565 addd6c8e844851116b2a051f4ab126606cfb17e6 Thomas Bocek <tom@tomp2p.net> 1409049246 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
addd6c8e844851116b2a051f4ab126606cfb17e6 ac79cf78eb020600c2b72c4897caaf3dcec69d70 Thomas Bocek <tom@tomp2p.net> 1409053772 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
ac79cf78eb020600c2b72c4897caaf3dcec69d70 2c2e3f81554211ef600f1daf80213366f8d9345b Thomas Bocek <tom@tomp2p.net> 1409059780 +0200	commit: added new method
2c2e3f81554211ef600f1daf80213366f8d9345b deace1dcc5526441fa89c1c04d87231050acfde6 Thomas Bocek <tom@tomp2p.net> 1409063954 +0200	commit: improved duplicate payment
deace1dcc5526441fa89c1c04d87231050acfde6 4478533c06ac0a7d45ce2acba09e982e4b0d473f Thomas Bocek <tom@tomp2p.net> 1409063965 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Merge made by recursive.
4478533c06ac0a7d45ce2acba09e982e4b0d473f 9499119e0c19c65014f4d10f8db80ffff98dc493 Thomas Bocek <tom@tomp2p.net> 1409245713 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
9499119e0c19c65014f4d10f8db80ffff98dc493 643cde4a780a336ef7e5b579390de5f44ee2e7c2 Thomas Bocek <tom@tomp2p.net> 1409322966 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
643cde4a780a336ef7e5b579390de5f44ee2e7c2 b53c8d76db982b545758c95a0675bd31f8de4a85 Thomas Bocek <tom@tomp2p.net> 1409328709 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
b53c8d76db982b545758c95a0675bd31f8de4a85 02fc28c267e8ba0d40a69bbc04840ce64ed494b0 Thomas Bocek <tom@tomp2p.net> 1409391413 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
02fc28c267e8ba0d40a69bbc04840ce64ed494b0 285e32f4da516b1c4d5f83a3c344a4849a2ff5c1 Thomas Bocek <tom@tomp2p.net> 1409391525 +0200	commit: potential fix for the nullpointer in the timehandler
285e32f4da516b1c4d5f83a3c344a4849a2ff5c1 b218240323d9ef53540307f64e84109867f8bed6 Thomas Bocek <tom@tomp2p.net> 1409491865 +0200	commit: added support for unconfirmed messages
b218240323d9ef53540307f64e84109867f8bed6 d81ab2a66b57c28c30e5ceed5e8d1067c712fceb Thomas Bocek <tom@tomp2p.net> 1409492946 +0200	commit: shortened string
d81ab2a66b57c28c30e5ceed5e8d1067c712fceb e6b03b26bb27ee87f4d29ded9c152895df625cd1 Thomas Bocek <tom@tomp2p.net> 1409493255 +0200	commit: string update
e6b03b26bb27ee87f4d29ded9c152895df625cd1 00d8fa4cd1d64d6c40dadf74039f6b4e7c039298 Thomas Bocek <tom@tomp2p.net> 1409493667 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
00d8fa4cd1d64d6c40dadf74039f6b4e7c039298 6d1f1cc42f314569dbcddaa6ced5ff1c08e2e9ab Thomas Bocek <tom@tomp2p.net> 1409495778 +0200	commit: play notification sound if transaction ok
6d1f1cc42f314569dbcddaa6ced5ff1c08e2e9ab bc4d07fbfc15537fe4b6cfdfd9df4b5b0d2ecbe0 Thomas Bocek <tom@tomp2p.net> 1409496542 +0200	commit: set to regular mode
bc4d07fbfc15537fe4b6cfdfd9df4b5b0d2ecbe0 58487c4b78563359335d769bb3aaa0117ecb200b Thomas Bocek <tom@tomp2p.net> 1409498191 +0200	commit: renamed package to coinblesk
58487c4b78563359335d769bb3aaa0117ecb200b e0e7f82cf69238645b0cc7835feace12ceb345f1 Thomas Bocek <tom@tomp2p.net> 1409504402 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
e0e7f82cf69238645b0cc7835feace12ceb345f1 3265876cee6893209a190d92b774f993da5ce9b6 Thomas Bocek <tom@tomp2p.net> 1409504674 +0200	commit: increased version number
3265876cee6893209a190d92b774f993da5ce9b6 4743a7028da767c29fc85677b298019963adf17a Thomas Bocek <tom@tomp2p.net> 1410608925 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
4743a7028da767c29fc85677b298019963adf17a c829f776f1866af113f9598fdfb9b9c7aa57b66f Thomas Bocek <tom@tomp2p.net> 1410616803 +0200	commit: added USB stick login
c829f776f1866af113f9598fdfb9b9c7aa57b66f 7980e77d24ab14b564fbc98d988380e3d9ac0f99 Thomas Bocek <tom@tomp2p.net> 1412072424 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps_client.git: Fast-forward
7980e77d24ab14b564fbc98d988380e3d9ac0f99 ba010fbc92f1d53e2aad4d144abb298ff02d4569 Raphael <r.voellmy@gmail.com> 1426520123 +0100	commit: renamed mbps to coinblesk
ba010fbc92f1d53e2aad4d144abb298ff02d4569 c3484ff3bbb7a4e44f8c088fa27a087605534fe2 Raphael <r.voellmy@gmail.com> 1431936783 +0200	commit: switched project to gradle, included bitcoinj in client, changed internal storage from XML to shared preferences, implemented bound bitcoin wallet service, implemented blockchain synchronization progress bar on the main activity, implemented cloud backup of personal data
c3484ff3bbb7a4e44f8c088fa27a087605534fe2 09b61cfe0f27f83353ea96f5e046d9854b52d0a2 Raphael <r.voellmy@gmail.com> 1431936997 +0200	commit: removed build directory from git index
09b61cfe0f27f83353ea96f5e046d9854b52d0a2 6569b94fd8074061cde0854cbac77732df752f2d Raphael <r.voellmy@gmail.com> 1432068973 +0200	commit: Implemented the transaction signer that sends the partially signed transaction to the server for signing and broadcasting, added server watching key and bitcoin net to internal storage, improved wallet setup (in preparation for cloud restore), removed XML storage, and multiple bugfixes
6569b94fd8074061cde0854cbac77732df752f2d 3cadbc420e0d0baa84f00c05c989e35e6dc126dd Raphael <r.voellmy@gmail.com> 1432069757 +0200	commit: make sure the blockchain sync progress bar is only visible if the wallet is actually downloading blocks
3cadbc420e0d0baa84f00c05c989e35e6dc126dd 5d0658486f17a7ae21aa8dbe2324cce47ef27126 Raphael <r.voellmy@gmail.com> 1432158734 +0200	commit: Make sure wallet only gets married when first set up, lock wallet service initialization to prevent illegal state exception if two threads try to init the service
5d0658486f17a7ae21aa8dbe2324cce47ef27126 deb2d6a30e4847c451acf5ead76500fff00296be Raphael <r.voellmy@gmail.com> 1432555372 +0200	commit: Initialize server transaction signer context before syncing the blockchain
deb2d6a30e4847c451acf5ead76500fff00296be 0d033a7a202be1df8eb1e56bae4893b8552326ab Raphael <r.voellmy@gmail.com> 1432557844 +0200	commit: re-organized project
0d033a7a202be1df8eb1e56bae4893b8552326ab 9f098633889e2e84aec2bf3140fd3efdff864a06 Raphael <r.voellmy@gmail.com> 1432584586 +0200	commit: Re-implemented wallet history (no longer loaded from server but loaded from the local wallet), card view for transaction history (todo: filter by type), blockchain sync status is not queried indefinetely anymore if the blockchain is already synced when logging in
9f098633889e2e84aec2bf3140fd3efdff864a06 828e8a2ba0ad17a7439b86accd7a1cb9bf61d931 Raphael <r.voellmy@gmail.com> 1432801745 +0200	commit: Stability improvements, removed balance from internal storage (is now queried directly from the wallet), minor styling changes
828e8a2ba0ad17a7439b86accd7a1cb9bf61d931 eaa025b2179a3eb4130d8282e95c010d97f9ddf4 Raphael <r.voellmy@gmail.com> 1432828480 +0200	commit: Added wallet settings to the settings activity, prepared wallet restore for new devices
eaa025b2179a3eb4130d8282e95c010d97f9ddf4 29c7a03f02a8142401d3929603799f63284d2ec7 Raphael <r.voellmy@gmail.com> 1434308557 +0200	commit: Implemented wallet restore (WIP), stability improvements, minor styling changes, set up wallet service test
29c7a03f02a8142401d3929603799f63284d2ec7 d5f738fa1f013f5f4bb51f9f02a6b816a76bcf28 Raphael <r.voellmy@gmail.com> 1434310347 +0200	commit: Updated Drawer from v4 to v7
d5f738fa1f013f5f4bb51f9f02a6b816a76bcf28 10623451f545aa1b4110f985faa070b46995c98a Raphael <r.voellmy@gmail.com> 1434960962 +0200	commit: Set up instrumentation tests
10623451f545aa1b4110f985faa070b46995c98a b11c60f071dc84e37f9b58d414c4efe32243d215 Raphael <r.voellmy@gmail.com> 1435053854 +0200	commit: created instrumentation test of login activity, created request factory in order to mock server responses for tests.
b11c60f071dc84e37f9b58d414c4efe32243d215 7bb0578ea02e721142fc0e325e4181161ba0087f Raphael <r.voellmy@gmail.com> 1435056612 +0200	commit: Created base class for tests with login
7bb0578ea02e721142fc0e325e4181161ba0087f 98a8895eafdf8513ac090dab521cb04e932e2200 Raphael <r.voellmy@gmail.com> 1435070059 +0200	commit: Created test of RestoreOrCreateActivity, updated testnet checkpoints file
98a8895eafdf8513ac090dab521cb04e932e2200 d34843432a02110f47f99b9d9ebefbef5bb4de4c Raphael <r.voellmy@gmail.com> 1435133339 +0200	commit: Improved loading of the main activity. UI thread is no longer blocked by starting of the wallet.
d34843432a02110f47f99b9d9ebefbef5bb4de4c 9be5044c634084c1301c0f867d5550f7a974125f Raphael <r.voellmy@gmail.com> 1435671287 +0200	commit: Added possibility to add complete listener to server transaction signer, added create refund tx method to wallet service, implemented unit test for creating transaction
9be5044c634084c1301c0f867d5550f7a974125f a5e15a7cfb41b3522dd86bb6a7f8b41f998b8f64 Raphael <r.voellmy@gmail.com> 1435834810 +0200	commit: Added ability to create private addresses that do not require the signature of the server, added method to create refund transactions, more unit tests for wallet service
a5e15a7cfb41b3522dd86bb6a7f8b41f998b8f64 c54d0955282476ede3a091e81a35540640de916e Raphael <r.voellmy@gmail.com> 1435847046 +0200	commit: Major refactoring: completely removed user accounts. Created new launch activity that either loads the main activity or the "restore or new"/activity. Still work in progress
c54d0955282476ede3a091e81a35540640de916e c48bdb5203d8ee161b605dffb267849457924dfc Raphael <r.voellmy@gmail.com> 1435936021 +0200	commit: Rewrote request tasks:
c48bdb5203d8ee161b605dffb267849457924dfc c6a90449f0496cf72758c855cf5df1b71f2ed4bd Raphael <r.voellmy@gmail.com> 1435945707 +0200	commit: Fixed test after removing user accounts
c6a90449f0496cf72758c855cf5df1b71f2ed4bd f81f454d07183f899b1364aa567b70b03fba1eae Raphael <r.voellmy@gmail.com> 1436026450 +0200	commit: Implemented automatic refund transaction broadcasting and re-depositing (still WIP)
f81f454d07183f899b1364aa567b70b03fba1eae 77b2767afc3d71bb77530ae8888c385c64ebeaec Raphael <r.voellmy@gmail.com> 1436191541 +0200	commit: Finished implementing and testing automatic creation of refund transaction and redeposits, created storage handler interface for using an alternative storage type (e.g. memory storage)
77b2767afc3d71bb77530ae8888c385c64ebeaec 4766b47037912ea7cae5c0ebf0fc4da8a982749e Raphael <r.voellmy@gmail.com> 1436524114 +0200	commit: Implemented sending the watching key to the server after setting up the wallet.
4766b47037912ea7cae5c0ebf0fc4da8a982749e b85a6c1a549d95495f51a1649de019ff02fb6e7c Raphael <r.voellmy@gmail.com> 1436528300 +0200	commit: Bugfix: removed doOutput because that will cause a POST request
b85a6c1a549d95495f51a1649de019ff02fb6e7c d05e188122bf8d765ccbc4123924c45fd62dd22b Raphael <r.voellmy@gmail.com> 1436795815 +0200	commit: implement test for pay out activity
d05e188122bf8d765ccbc4123924c45fd62dd22b 9172af618825d9cba95b1555892db1595b00172f Raphael <r.voellmy@gmail.com> 1436796292 +0200	commit: remove client controller class completely
9172af618825d9cba95b1555892db1595b00172f f1f222c40ac2ae5efbe094cbbf0eb68bbe198462 Raphael <r.voellmy@gmail.com> 1436800058 +0200	commit: Show transactions instantly on the main view
f1f222c40ac2ae5efbe094cbbf0eb68bbe198462 dcb1e0f2b71908cd882f16ff92c7ae4f62b1c206 Raphael <r.voellmy@gmail.com> 1436876398 +0200	commit: add build script
dcb1e0f2b71908cd882f16ff92c7ae4f62b1c206 f2bf491eff5f63cefe6048f6516ddc0edaa05f06 Raphael <r.voellmy@gmail.com> 1436876488 +0200	commit (merge): Merge remote-tracking branch 'origin/master'
f2bf491eff5f63cefe6048f6516ddc0edaa05f06 bd815bda38501dc3629c8ecdbac1c202c9541646 Raphael <r.voellmy@gmail.com> 1437035924 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
bd815bda38501dc3629c8ecdbac1c202c9541646 933365ae953be384b389e560266a3159c312202a Raphael <r.voellmy@gmail.com> 1437036342 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
933365ae953be384b389e560266a3159c312202a 1040e4adfbcef6ece2eb184456a98178c9feba43 Raphael <r.voellmy@gmail.com> 1437471428 +0200	commit: add NFC protocol
1040e4adfbcef6ece2eb184456a98178c9feba43 7421370ee40fe8d33fb699420d121b5f590f210a Raphael <r.voellmy@gmail.com> 1437506002 +0200	commit: implement merchant settings
7421370ee40fe8d33fb699420d121b5f590f210a fb45977c478e1437f7a9f0079d8216bdfd8465e1 Raphael <r.voellmy@gmail.com> 1437566574 +0200	commit: implement merchant mode that allows selling BTC on an exchange immediately after receiving
fb45977c478e1437f7a9f0079d8216bdfd8465e1 1d5a593e40610de700ca101d42b42662a3f1d7a8 Raphael <r.voellmy@gmail.com> 1437640505 +0200	commit: bugfix in post request task
1d5a593e40610de700ca101d42b42662a3f1d7a8 21bf3d29bdb8e5faa24cb0ae7a6f0b94fd88bf39 Raphael <r.voellmy@gmail.com> 1437641377 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
21bf3d29bdb8e5faa24cb0ae7a6f0b94fd88bf39 f93cf9a718ea13e93390921e0f6cda9adb42d3fc Raphael <r.voellmy@gmail.com> 1437642605 +0200	commit: Fix and improve restore or new activity
f93cf9a718ea13e93390921e0f6cda9adb42d3fc c9e45476615c278a8907330478a3288a48dafa67 Raphael <r.voellmy@gmail.com> 1437654240 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
c9e45476615c278a8907330478a3288a48dafa67 fce837fafe5401d56c43e6e4fafcd17e6074a512 Raphael <r.voellmy@gmail.com> 1437665163 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
fce837fafe5401d56c43e6e4fafcd17e6074a512 768b1b9b02124afce0391abe660b4c219a37025b Raphael <r.voellmy@gmail.com> 1437727255 +0200	commit: fix tablet layouts after change to appcompat toolbar
768b1b9b02124afce0391abe660b4c219a37025b c84f1af9d6445f6e20e71aefd1334750916189aa Raphael <r.voellmy@gmail.com> 1437727362 +0200	commit: add payment ok status to payment protocol
c84f1af9d6445f6e20e71aefd1334750916189aa 94fe576c0c2823e98265cf534de17d9e4cfc3a14 Raphael <r.voellmy@gmail.com> 1437727697 +0200	commit: delete unused class
94fe576c0c2823e98265cf534de17d9e4cfc3a14 ad07524e75429930641dd6e7949c200fed1cd9d3 Raphael <r.voellmy@gmail.com> 1437731214 +0200	commit: change seed to (standard) 128 bit
ad07524e75429930641dd6e7949c200fed1cd9d3 4945f355794b1fcf4da9286a47471a42c1e7244c Raphael <r.voellmy@gmail.com> 1437943996 +0200	commit: Implemented basic NFC payment
4945f355794b1fcf4da9286a47471a42c1e7244c d26ec308e65681c1d2cd57d02e0136da1b4706de Raphael <r.voellmy@gmail.com> 1438083165 +0200	commit: improve build time with proguard
d26ec308e65681c1d2cd57d02e0136da1b4706de 49560541dbbfea747f53ccaf531796c65e90ab05 Raphael <r.voellmy@gmail.com> 1438085493 +0200	commit: Bug fix
49560541dbbfea747f53ccaf531796c65e90ab05 af7016a1d6fa8147dee0cf72d47e95ceb39feeb6 Raphael <r.voellmy@gmail.com> 1438086289 +0200	commit: Keep AbstractBlockChain class
af7016a1d6fa8147dee0cf72d47e95ceb39feeb6 38af5628bb3c5c0456bb2a686159da983dd7e14e Raphael <r.voellmy@gmail.com> 1438088620 +0200	commit: Fix endless exchange rate requests after wallet setup
38af5628bb3c5c0456bb2a686159da983dd7e14e 6f29dfa7e4962605e106f370e12ea1316f444bb1 Raphael <r.voellmy@gmail.com> 1438089535 +0200	commit: Finish setup activity after main activity is started
6f29dfa7e4962605e106f370e12ea1316f444bb1 092f2a81c51410841ecacb91e7c027495caeb46c Raphael <r.voellmy@gmail.com> 1438090849 +0200	commit: Switch to light theme
092f2a81c51410841ecacb91e7c027495caeb46c 32ae36aa8f453a03d96841676c3047a33f257a6a Raphael <r.voellmy@gmail.com> 1438091825 +0200	commit: fix switching of currency unit
32ae36aa8f453a03d96841676c3047a33f257a6a 07c93f51b02c6c5111ef1bdfcbc125889b258fba Raphael <r.voellmy@gmail.com> 1438096994 +0200	commit: add username
07c93f51b02c6c5111ef1bdfcbc125889b258fba a571f60e837d1b516382961ba9ca74f5b4919e7a Raphael <r.voellmy@gmail.com> 1438157655 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
a571f60e837d1b516382961ba9ca74f5b4919e7a 93aace3f9dea9f720bd3dfdefb324d5111b5fa2a Raphael <r.voellmy@gmail.com> 1438158339 +0200	commit: nullpointer fix
93aace3f9dea9f720bd3dfdefb324d5111b5fa2a 93aace3f9dea9f720bd3dfdefb324d5111b5fa2a Raphael <r.voellmy@gmail.com> 1438182756 +0200	checkout: moving from master to dev
93aace3f9dea9f720bd3dfdefb324d5111b5fa2a 6c67008449ba19d2b663eb6961ff97b9bce49c6a Raphael <r.voellmy@gmail.com> 1438182910 +0200	commit: Moved nfc setup to other class
6c67008449ba19d2b663eb6961ff97b9bce49c6a 93aace3f9dea9f720bd3dfdefb324d5111b5fa2a Raphael <r.voellmy@gmail.com> 1438182931 +0200	checkout: moving from dev to master
93aace3f9dea9f720bd3dfdefb324d5111b5fa2a 6c67008449ba19d2b663eb6961ff97b9bce49c6a Raphael <r.voellmy@gmail.com> 1438184421 +0200	checkout: moving from master to dev
6c67008449ba19d2b663eb6961ff97b9bce49c6a 4e44b417a4082855c2f76268901ab747b3a1bf30 Raphael <r.voellmy@gmail.com> 1438186432 +0200	commit: Minor refactoring of nfc payment setup but still not working
4e44b417a4082855c2f76268901ab747b3a1bf30 93aace3f9dea9f720bd3dfdefb324d5111b5fa2a Raphael <r.voellmy@gmail.com> 1438186451 +0200	checkout: moving from dev to master
93aace3f9dea9f720bd3dfdefb324d5111b5fa2a e63ecf0e83233d5384c7a008b2cd42c829e44064 Raphael <r.voellmy@gmail.com> 1438266790 +0200	commit: implement NFC payment and nfc payment listener. Still some issues remaining
e63ecf0e83233d5384c7a008b2cd42c829e44064 bd341ce4fa0fe740be96481f1b89e18bc1955442 Raphael <r.voellmy@gmail.com> 1438590383 +0200	commit: add sql database for storing transaction metadata and address book entries
bd341ce4fa0fe740be96481f1b89e18bc1955442 880c5b8b8a924ffda9b77dee553ba182fc9eda66 Raphael <r.voellmy@gmail.com> 1438594909 +0200	commit: fix NFC payment bug
880c5b8b8a924ffda9b77dee553ba182fc9eda66 3a7a33885ce5614b2b94b073baffadcbfcf5889d Raphael <r.voellmy@gmail.com> 1438787186 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
3a7a33885ce5614b2b94b073baffadcbfcf5889d a714222a4460aa7a486b9d3c7db406cc3d5860be Raphael <r.voellmy@gmail.com> 1439282326 +0200	commit: Added payment confirmation
a714222a4460aa7a486b9d3c7db406cc3d5860be 2208980bfa100c3e4cb237adb323fbc7f68e7cac Raphael <r.voellmy@gmail.com> 1439812761 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
2208980bfa100c3e4cb237adb323fbc7f68e7cac d77979547c5144470e09be1f64e95f202e11cca0 Raphael <r.voellmy@gmail.com> 1439891106 +0200	commit: remove customserialization dependency
d77979547c5144470e09be1f64e95f202e11cca0 9b1c878db137aed1818c793068da8991cbecb59d Raphael <r.voellmy@gmail.com> 1439901861 +0200	commit: sned username with payment response
9b1c878db137aed1818c793068da8991cbecb59d f2dd6069a5d628c8d9fd44b57b55cc0fcd852257 Raphael <r.voellmy@gmail.com> 1439976752 +0200	commit: Auto accept payments from trusted contacts
f2dd6069a5d628c8d9fd44b57b55cc0fcd852257 1dcd90be9802142e408a0c21dbaad646a6e837e8 Raphael <r.voellmy@gmail.com> 1439976771 +0200	merge origin/master: Merge made by the 'recursive' strategy.
1dcd90be9802142e408a0c21dbaad646a6e837e8 65d6daeeeb19852717cee70f6d56b2c9583da116 Raphael <r.voellmy@gmail.com> 1439991371 +0200	commit: fix auto accept, fix history description if receiver unknown
65d6daeeeb19852717cee70f6d56b2c9583da116 e037a616db15574b3e23010324a7d9e8b078c0b2 Raphael <r.voellmy@gmail.com> 1439994171 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
e037a616db15574b3e23010324a7d9e8b078c0b2 5bb4839efcb5dfb257c425bae3a4e23c6a211718 Raphael <r.voellmy@gmail.com> 1439994958 +0200	commit: fix auto accept bug, added secondary exchange settings
5bb4839efcb5dfb257c425bae3a4e23c6a211718 08a23dcec778c80b346b9f5532651540ce4be31e Raphael <r.voellmy@gmail.com> 1440003424 +0200	commit: get address from signed transaction and save in the address book
08a23dcec778c80b346b9f5532651540ce4be31e c647cd4ac0ae3a22c4e946c1631da565b0240610 Raphael <r.voellmy@gmail.com> 1440003968 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
c647cd4ac0ae3a22c4e946c1631da565b0240610 da5ccd85596cfb352f18e2377edbfd51033712af Raphael <r.voellmy@gmail.com> 1440084486 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
da5ccd85596cfb352f18e2377edbfd51033712af 1fbf1f43d11db61c2d1c74404e04e33e78fc6aa6 Raphael <r.voellmy@gmail.com> 1440091540 +0200	commit: Add method to wallet service that checks if a transaction was signed by the server
1fbf1f43d11db61c2d1c74404e04e33e78fc6aa6 7fe82c1efd80114a05951fc7cc66fbd386124f13 Raphael <r.voellmy@gmail.com> 1440162482 +0200	commit: simplified server signature request transfer object
7fe82c1efd80114a05951fc7cc66fbd386124f13 471c6e61858358ca32aceed0d82d585c2543c260 Raphael <r.voellmy@gmail.com> 1440164990 +0200	commit: rename child paths -> child numbers
471c6e61858358ca32aceed0d82d585c2543c260 7691cf0ca7a91b164ab2ea875ab85e5207c2221b Raphael <r.voellmy@gmail.com> 1440168157 +0200	commit: The signatures of server signed transactions are now validated by the receiving party
7691cf0ca7a91b164ab2ea875ab85e5207c2221b a862a9d87f20083fbe55c8082db86d13a4f296c0 Raphael <r.voellmy@gmail.com> 1440236116 +0200	commit: implemented send payment activity
a862a9d87f20083fbe55c8082db86d13a4f296c0 ac312787090e48f4e8706e6925102cbfe50a5d8a Raphael <r.voellmy@gmail.com> 1440236311 +0200	commit (merge): Merge branch 'master' of https://github.com/coinblesk/coinblesk-client
ac312787090e48f4e8706e6925102cbfe50a5d8a 3cd2f4a6ea07362524ddc5f9001e1d910750dc87 Raphael <r.voellmy@gmail.com> 1440239583 +0200	commit: Fix after adding account numbers to signature requests
3cd2f4a6ea07362524ddc5f9001e1d910750dc87 94371ebe76c66298ac48135e158c9da0ce51879d Raphael <r.voellmy@gmail.com> 1440240766 +0200	commit: fix bug where account numbers are missing in server signature request
94371ebe76c66298ac48135e158c9da0ce51879d 5b5ddb70643d88fb7e59658556a7a6997938637d Raphael <r.voellmy@gmail.com> 1440242446 +0200	commit: Cache bitcoin exchange rates for 30 seconds
5b5ddb70643d88fb7e59658556a7a6997938637d 80b87d221174e1145da708a6ed3a39313d5b2b4c Raphael <r.voellmy@gmail.com> 1440244178 +0200	commit: Bugfix in exchange rate caching
80b87d221174e1145da708a6ed3a39313d5b2b4c e24ea8f7fc58707e39ad2f192d49e559314c470f Raphael <r.voellmy@gmail.com> 1440251929 +0200	commit: Implemented pay to know receiver
e24ea8f7fc58707e39ad2f192d49e559314c470f af6529ab2f2b8768597cd1024ebb490ecec48757 Raphael <r.voellmy@gmail.com> 1440251942 +0200	pull --progress --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
af6529ab2f2b8768597cd1024ebb490ecec48757 8c102a26b7440763234c47eab312c0aa91d8f2c6 Raphael <r.voellmy@gmail.com> 1440256061 +0200	commit: bugfix: run listener on UI thread if exchangerate was loaded from cache
8c102a26b7440763234c47eab312c0aa91d8f2c6 12ecc5d6ff0045fe201d146661c3204f22f81a04 Raphael <r.voellmy@gmail.com> 1440260386 +0200	commit: remove public identifier in interface
12ecc5d6ff0045fe201d146661c3204f22f81a04 dd61dc28b20a16b9b2eecbe10ecb47b965526bec Raphael <r.voellmy@gmail.com> 1440260394 +0200	pull --progress --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
dd61dc28b20a16b9b2eecbe10ecb47b965526bec c6e0ee7477adbc9bd4099df90cf43359f141deff Raphael <r.voellmy@gmail.com> 1440334561 +0200	pull --progress --no-stat -v --progress origin master: Merge made by the 'recursive' strategy.
c6e0ee7477adbc9bd4099df90cf43359f141deff 5b50144e794c1291c4297bee72d4bdb1d57bdf22 Raphael <r.voellmy@gmail.com> 1440347019 +0200	commit: No longer commit half signed transactions to the wallet, and other improvements
5b50144e794c1291c4297bee72d4bdb1d57bdf22 8e8f5e6dfec07b3600a8ffca5671de4cb5dda14a Raphael <r.voellmy@gmail.com> 1440430130 +0200	commit: Upgrade to bitcoinj 13.2, custom coin selector to select instant transactions and transactions with enough confirmations, load block height from block store if not connected to any peer, use receivePending instead of maybeCommitTx, more verbose logging, other bugfixes and improvements
8e8f5e6dfec07b3600a8ffca5671de4cb5dda14a 252af91b8a3b5af110054cd2a361229feec892d2 Raphael <r.voellmy@gmail.com> 1440432037 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
252af91b8a3b5af110054cd2a361229feec892d2 b675c6b3d20ab31148f9e911c172f18c86cc67bc Raphael <r.voellmy@gmail.com> 1440433618 +0200	commit: Fixed wallet service binding
b675c6b3d20ab31148f9e911c172f18c86cc67bc 4d28aec97b60a4576a4c6940378c28de2978b63f Raphael <r.voellmy@gmail.com> 1440512643 +0200	commit: Fixed exchange setup, catch insufficient money exception in NFC protocol
4d28aec97b60a4576a4c6940378c28de2978b63f f8f0e526e49c478f895abd833fa881e5cb38b72c Raphael <r.voellmy@gmail.com> 1440512654 +0200	merge origin/master: Merge made by the 'recursive' strategy.
f8f0e526e49c478f895abd833fa881e5cb38b72c 4168fdb9eba4f099ac0edcea1c68e2419f0c7e6d Raphael <r.voellmy@gmail.com> 1440513067 +0200	pull --progress --no-stat -v --progress origin master: Fast-forward
4168fdb9eba4f099ac0edcea1c68e2419f0c7e6d da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc Raphael <r.voellmy@gmail.com> 1440527153 +0200	commit: finished merchant mode implementation
da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc Raphael <r.voellmy@gmail.com> 1440528100 +0200	checkout: moving from master to demo-branch
da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc Raphael <r.voellmy@gmail.com> 1440528114 +0200	checkout: moving from demo-branch to master
da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc Raphael <r.voellmy@gmail.com> 1440528120 +0200	checkout: moving from master to demo-branch
da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc da0ce7d9ea2439d94242b2f5ed3467aa8aaecffc Raphael <r.voellmy@gmail.com> 1440528125 +0200	checkout: moving from demo-branch to master
