0000000000000000000000000000000000000000 01cc43893ecf8f8b4781ff5d654e257da5b8b3a3 Thomas Bocek <tom@tomp2p.net> 1402057446 +0200	
01cc43893ecf8f8b4781ff5d654e257da5b8b3a3 36bc56f0b102da73b84bf3821c3cb2543c9c8437 Raphael <r.voellmy@gmail.com> 1426520062 +0100	merge develop-testserver: Fast-forward
36bc56f0b102da73b84bf3821c3cb2543c9c8437 05a58184fb50bb2b515ced3cde7c9a3802aa4ae9 Raphael <r.voellmy@gmail.com> 1426698520 +0100	commit: Mock JNDI for credentials
05a58184fb50bb2b515ced3cde7c9a3802aa4ae9 fa9b2cf1da58e4cd9738e819c2a2d55fb35d1f32 Raphael <r.voellmy@gmail.com> 1426780031 +0100	commit: Fixed JUnit tests
fa9b2cf1da58e4cd9738e819c2a2d55fb35d1f32 10783c07d874f2a90d10cf72b2a0a5d0a5fe04e9 Raphael <r.voellmy@gmail.com> 1427362992 +0100	commit: Fixed more JUnit tests, removed dependency from running database in testing environment
10783c07d874f2a90d10cf72b2a0a5d0a5fe04e9 d7b246485207b280f207c61ec18267b8f344122f Raphael <r.voellmy@gmail.com> 1427641978 +0200	commit: cleaned up context files, changed default parameters for maven tomcat plugin, removed target directory from git index
d7b246485207b280f207c61ec18267b8f344122f e8a20842ff1d15132d3d3e42332c62a0a816158f Raphael <r.voellmy@gmail.com> 1427899356 +0200	commit: Added datasource factory
e8a20842ff1d15132d3d3e42332c62a0a816158f 816e4106708c046494bf603315cacba27a2668f7 Raphael <r.voellmy@gmail.com> 1427899384 +0200	commit: added instructions to set up the server
816e4106708c046494bf603315cacba27a2668f7 6255834f8190c6851179c3ce2d1b086615410998 Raphael <r.voellmy@gmail.com> 1429197414 +0200	commit: created emailer service, load email server settings from server.properties, added bouncy castle instructions to readme
6255834f8190c6851179c3ce2d1b086615410998 e4340ceef3528ae7bacebcf2718ef1c9ac54f183 Raphael <r.voellmy@gmail.com> 1432043214 +0200	commit: Removed Bitcoin Core RPC and replaced it with BitcoinJ (still work in progress). The method for signing partially signed methods is partially implemented, but doesn't check for double spends yet. 
e4340ceef3528ae7bacebcf2718ef1c9ac54f183 021d78d9c95049e990d73d4e447ce925b854ac60 Raphael <r.voellmy@gmail.com> 1432158656 +0200	commit: fixed transaction signing and updated to the latest bitcoinj snapshot
021d78d9c95049e990d73d4e447ce925b854ac60 0ac6bfd0261fca4a73ad84f5fde28cb2a51c6195 Raphael <r.voellmy@gmail.com> 1435159403 +0200	commit: major cleanup, completely removed inter-server settlement, fixed junit tests. Still WIP
0ac6bfd0261fca4a73ad84f5fde28cb2a51c6195 a4a70ffa0586da74a20945c350d1e942b485fc7d Raphael <r.voellmy@gmail.com> 1435572701 +0200	commit: Fixed unit tests, unit tests no longer connect to the bitcoin test net but use unit test parameters instead (significant performance boost!), added clearWalletFiles flag to bitcoin service that cleans up the wallet files from tests,
a4a70ffa0586da74a20945c350d1e942b485fc7d 2a6706d2e4791b0ce95d2efb5f35e21a4117da93 Raphael <r.voellmy@gmail.com> 1435579062 +0200	commit: Removed legacy methods from bitcoin wallet service
2a6706d2e4791b0ce95d2efb5f35e21a4117da93 01573eca165c43125f9d729375b8e2452edd6af4 Raphael <r.voellmy@gmail.com> 1435586607 +0200	commit: Added tests for signing client transactions
01573eca165c43125f9d729375b8e2452edd6af4 82c7a78ddbf6e92691724ac892a89bf76333247a Raphael <r.voellmy@gmail.com> 1436266366 +0200	commit: Removed (almost) all authentication and user stuff, added signed inputs entity to keep track of the inputs that were signed for refund transactions
82c7a78ddbf6e92691724ac892a89bf76333247a 68fbcb7405a80c1ce1696ec2130db5255d36bf5d Raphael <r.voellmy@gmail.com> 1436354268 +0200	commit: Implemented and tested persisting of inputs signed for refund transactions.
68fbcb7405a80c1ce1696ec2130db5255d36bf5d 657a66909a7fb29a433cd539bc57649eb88e2854 Raphael <r.voellmy@gmail.com> 1436454966 +0200	commit: * The server now checks the inputs if they are still unspent. This means that the server needs to know which addresses to watch. Therefore the client needs to send his watching key to the server before setting up the wallet. * Implemented more wallet service tests  * removed unneeded DBUnit test files
657a66909a7fb29a433cd539bc57649eb88e2854 4d258b78a70fc0e88d043ce1d192e5ca797f9721 Raphael <r.voellmy@gmail.com> 1436524173 +0200	commit: Reorganized endpoints. All wallet related endpoints are now in the bitcoin wallet controller.
4d258b78a70fc0e88d043ce1d192e5ca797f9721 8081f02626ce2b7ea208e1e6558d274eb678a35b Raphael <r.voellmy@gmail.com> 1436649053 +0200	commit: * upgrade to spring 4 * remove xml configuration and change to code based configuration * using spring boot * Change to Gson http converter * Simplified transfer object class * removed more unneeded classes * Implemented test for wallet controller
8081f02626ce2b7ea208e1e6558d274eb678a35b 08b1e41f09f90bda76c2486fa6d77a7f0c43e4eb Raphael <r.voellmy@gmail.com> 1436702014 +0200	commit: Fix and improve database configuration
08b1e41f09f90bda76c2486fa6d77a7f0c43e4eb 3a69938a7e335a3b5b22e9bd81f32efcc284f3f0 Raphael <r.voellmy@gmail.com> 1436780509 +0200	commit: fix exchange rate request implement exchange rate test add exchange rate transfer object that allows adding more currencies (not needed for now) remove MtGox
3a69938a7e335a3b5b22e9bd81f32efcc284f3f0 5e2902687cfd52380bc5d805f7deea7b55d53e9f Raphael <r.voellmy@gmail.com> 1437580380 +0200	commit: add forex exchange rate service add test for saving client's watching key fix bug in bitcoin wallet controller
5e2902687cfd52380bc5d805f7deea7b55d53e9f 20766f5098d420f1d25a4ece61f0a784ce32c2f1 Raphael <r.voellmy@gmail.com> 1437642676 +0200	commit: Fix logging
20766f5098d420f1d25a4ece61f0a784ce32c2f1 381c6efcd093c3983165111e4aeda261b53930f3 Raphael <r.voellmy@gmail.com> 1437837215 +0200	commit: bitcoin wallet service now returns the signed trnsaction after broadcasting it fix test database setup
381c6efcd093c3983165111e4aeda261b53930f3 7c5456be37a05ddd8483fe920a6c336c841ff0a9 Raphael <r.voellmy@gmail.com> 1437906511 +0200	commit: fix sign and broadcast request
7c5456be37a05ddd8483fe920a6c336c841ff0a9 f04c0d4515cc3e47faf5b55b0f6b52fb1b6296b2 Raphael <r.voellmy@gmail.com> 1438084362 +0200	commit: Allow absolute paths for bitcoinj wallet files directory Added logging settings to application properties
f04c0d4515cc3e47faf5b55b0f6b52fb1b6296b2 562fc78e1da879251baa0aa7a31c9de7aa79ba2e Raphael <r.voellmy@gmail.com> 1438086698 +0200	commit: change wallet directory
562fc78e1da879251baa0aa7a31c9de7aa79ba2e 37b1eafdde804a48ca92dd570600f56fd3229d5a Raphael <r.voellmy@gmail.com> 1439385090 +0200	pull: Fast-forward
37b1eafdde804a48ca92dd570600f56fd3229d5a 1023a5b1d6868b46b4c0ea9c71e0e3ddc99dad4c Raphael <r.voellmy@gmail.com> 1439886746 +0200	pull: Fast-forward
1023a5b1d6868b46b4c0ea9c71e0e3ddc99dad4c 1cbfaba0ad760ff22307f7b1f0f97641785daf56 Raphael <r.voellmy@gmail.com> 1439887075 +0200	merge branch 'master' of https://github.com/coinblesk/coinblesk-server.git: Fast-forward
1cbfaba0ad760ff22307f7b1f0f97641785daf56 dd045853aea64539a9a65709405ea39e84ad6584 Raphael <r.voellmy@gmail.com> 1439888375 +0200	commit: save client watching keys in database and prevent adding them to the wallet multiple times
dd045853aea64539a9a65709405ea39e84ad6584 a18f3dc7a9686ddf32667c1120d9dda4e6fd8eb9 Raphael <r.voellmy@gmail.com> 1439889974 +0200	pull: Fast-forward
a18f3dc7a9686ddf32667c1120d9dda4e6fd8eb9 425eceadd9a0505326e313d9bebac49030c6abe8 Raphael <r.voellmy@gmail.com> 1439891862 +0200	commit: fix wallet controller test, add jayway json dependency required by spring testutils
425eceadd9a0505326e313d9bebac49030c6abe8 d9280a33ffbb80c80d49023bfc2fda40269b8cf2 Raphael <r.voellmy@gmail.com> 1439892995 +0200	commit: fic setup info
d9280a33ffbb80c80d49023bfc2fda40269b8cf2 e979b2da2a630eb25c61c563e0153492fda72505 Raphael <r.voellmy@gmail.com> 1439895936 +0200	pull: Fast-forward
e979b2da2a630eb25c61c563e0153492fda72505 7f6d6239c4c2887087372b99564c9ebd91b49fcf Raphael <r.voellmy@gmail.com> 1439896596 +0200	commit: fix bitcoin wallet controller test
7f6d6239c4c2887087372b99564c9ebd91b49fcf dea8c377241c49e490fa2bc23aba148ed2248607 Raphael <r.voellmy@gmail.com> 1439907131 +0200	commit: check number of confirmations on unspent transactions before signing, keep track of signed transactions
dea8c377241c49e490fa2bc23aba148ed2248607 3893436db2aa2f27ea773e188bb47d6114fd94cf Raphael <r.voellmy@gmail.com> 1439971812 +0200	commit: signed transaction dao
3893436db2aa2f27ea773e188bb47d6114fd94cf 3569daad0dafd0083c520e9ccefb8a327ebd8261 Raphael <r.voellmy@gmail.com> 1440084321 +0200	commit: added confirmation check to server, simplified check if outputs are unspent, added check of client signature
3569daad0dafd0083c520e9ccefb8a327ebd8261 00f17b5d43ba30fff0f18721f6dd08e17cd4e82c Raphael <r.voellmy@gmail.com> 1440084346 +0200	pull: Merge made by the 'recursive' strategy.
00f17b5d43ba30fff0f18721f6dd08e17cd4e82c b54c45d06cd0a51cf5398c43dc562df98c015c68 Raphael <r.voellmy@gmail.com> 1440162418 +0200	commit: simplified server signature request transfer object
b54c45d06cd0a51cf5398c43dc562df98c015c68 a2f7f143b837e5047b78f80f5a463598d42472be Raphael <r.voellmy@gmail.com> 1440237606 +0200	commit: minor improvements and more verbose logging, use account numbers
a2f7f143b837e5047b78f80f5a463598d42472be 4432041e5dc62bca28eeca244431615a64435cfc Raphael <r.voellmy@gmail.com> 1440239056 +0200	commit: Fixed server after adding account number
4432041e5dc62bca28eeca244431615a64435cfc bc576a9b2efa08ac0c0640ef9d78ac38a61f1479 Raphael <r.voellmy@gmail.com> 1440256139 +0200	commit: accept risky transactions by default
bc576a9b2efa08ac0c0640ef9d78ac38a61f1479 0adbfa7c8ddd99c3b789e4b442a57d62b6a0e343 Raphael <r.voellmy@gmail.com> 1440418698 +0200	commit: improved transaction verification
0adbfa7c8ddd99c3b789e4b442a57d62b6a0e343 04ef22b4272456e06cccf23c17966314bd8e91cf Raphael <r.voellmy@gmail.com> 1440434777 +0200	commit: minor changes
04ef22b4272456e06cccf23c17966314bd8e91cf 6fc257766a4a5618127f7e0d2f36cfafedad2ffd Raphael <r.voellmy@gmail.com> 1440434959 +0200	commit: upgrade to bitcoinj 13.2
6fc257766a4a5618127f7e0d2f36cfafedad2ffd 7a87b3a65549229ac15529fd26c32f48b6f85c7c Raphael <r.voellmy@gmail.com> 1440598515 +0200	commit: add sample configuration file
7a87b3a65549229ac15529fd26c32f48b6f85c7c 7f61c444b0f22a88a3d81b9c169d2c45b0aa32ea Raphael <r.voellmy@gmail.com> 1440600347 +0200	commit: updated readme
