Commit Graph

9819 Commits

Author SHA1 Message Date
Manfred Karrer
3290586994 create offer moved to domain 2014-08-06 17:15:45 +02:00
Manfred Karrer
b7004d639c create offer moved to domain 2014-08-06 17:08:58 +02:00
Manfred Karrer
7cac1eceec refactored create offer process 2014-08-06 14:31:22 +02:00
Manfred Karrer
75581aa1fb disable contract check 2014-08-06 01:28:53 +02:00
Manfred Karrer
e382a0262d update readme 2014-08-06 01:22:02 +02:00
Manfred Karrer
a40f8255d3 merged rolands commit 2014-08-06 01:20:58 +02:00
Manfred Karrer
0ce1f1e415 merged rolands commit 2014-08-06 01:20:03 +02:00
Manfred Karrer
4cf5dde824 Merge branch 'master' of https://github.com/rolandkofler/bitsquare
Conflicts:
	README.md
2014-08-06 01:18:49 +02:00
Manfred Karrer
a6bce35b9f update readme 2014-08-06 00:26:56 +02:00
Manfred Karrer
c3039e8361 update to bitcoinJ master 2014-08-06 00:21:08 +02:00
Manfred Karrer
e0e6df6383 update to bitcoinJ master 2014-08-05 23:30:17 +02:00
Manfred Karrer
ff7aa52d39 update to bitcoinJ master: trade process working, signing and contract open to fix 2014-08-05 21:58:33 +02:00
Manfred Karrer
0f04d3c483 update to bitcoinJ master 2014-08-05 20:00:47 +02:00
rolandkofler
3f85152027 an example for a centralized exchange was given 2014-08-05 08:41:24 +02:00
rolandkofler
3cde978297 Short description what it is.
In order to facilitate understanding of the project, a short description of its goals is proposed.
2014-08-05 08:38:50 +02:00
Manfred Karrer
2190772370 remove persistence of dsa keypair 2014-08-01 18:00:26 +02:00
Manfred Karrer
2a6f0ccc62 remove persistence of dsa keypair 2014-08-01 17:05:32 +02:00
Manfred Karrer
bcbf5c8085 increase screen size 2014-08-01 16:50:01 +02:00
Manfred Karrer
603e86f14c refactoring: bank account, user, persistence 2014-08-01 16:45:42 +02:00
stevemyers
016ec4fe85 Merge pull request #46 from stevemyers/master
Updated maven javafx plugin so works with master and set git to ignore .log files.
2014-07-31 23:28:18 -07:00
Steve Myers
950ab93114 Updated maven javafx plugin dependency
http://stackoverflow.com/questions/19407959/javafx-maven-plugin-and-api-
incompatibility
2014-07-31 23:26:02 -07:00
Steve Myers
cceb53b2e0 Ignore all .log files 2014-07-31 22:58:23 -07:00
Manfred Karrer
197e37c849 move trademsg 2014-07-31 21:20:32 +02:00
Manfred Karrer
d943ee0918 use tomp2p master branch 2014-07-31 19:43:46 +02:00
Manfred Karrer
79a52a6e38 Merge branch 'master' of https://github.com/bitsquare/bitsquare 2014-07-31 18:54:01 +02:00
Manfred Karrer
57d5ddcc4f updated to master branch of tomp2p. refactored messaging. bootstrapping to seed node (server supported). right management. 2014-07-31 18:45:58 +02:00
hannesstockner
feef813872 Reformat transactions of a test trade on main net 2014-07-28 14:56:34 +01:00
hannesstockner
69ebaaea9d Reformat transactions of a test trade on main net 2014-07-28 14:55:57 +01:00
bitsquare
7739a5710a Merge pull request #45 from stevemyers/smyers-fix
added dependency to javafx maven plugin
2014-07-28 02:22:39 +02:00
Steve Myers
06a0a4fb41 added dependency to javafx maven plugin
This is to get around javafx-maven-plugin issue with latest maven
version. see:
http://stackoverflow.com/questions/19407959/javafx-maven-plugin-and-api-
incompatibility
2014-07-27 17:01:37 -07:00
bitsquare
f9aac1a2b6 Merge pull request #40 from stevemyers/smyers-fix
Replaced ByteInputStream with ByteArrayInputStream
2014-07-25 14:53:25 +02:00
Steve Myers
6b5bea2891 Replaced ByteInputStream with ByteArrayInputStream
ByteInputStream is an internal class and won’t compile with maven.
2014-07-24 21:35:11 -07:00
Manfred Karrer
222045ca5a changed logo 2014-07-14 03:32:35 +02:00
Manfred Karrer
88a3ec0f7b fix formatting bug, wrong fee payment, nullpointer with tab 2014-07-12 19:13:10 +02:00
Manfred Karrer
d5a5db1d42 deactivate auto fill with mock 2014-07-12 18:28:18 +02:00
Manfred Karrer
6a138c231a remove resource bundle 2014-07-09 23:04:56 +02:00
Manfred Karrer
6ca922ba2c use file File.seperator instead of "/" 2014-07-09 15:07:37 +02:00
Manfred Karrer
6395c4f92f fix problem with temp file on win8 2014-07-09 14:44:58 +02:00
Manfred Karrer
8509c60485 fix problem with temp file on win8 2014-07-09 14:23:29 +02:00
Manfred Karrer
7ef9481876 fix problem with temp file on win8 2014-07-09 14:21:09 +02:00
Manfred Karrer
99d00500de fix problem with temp file on win8 2014-07-09 14:04:26 +02:00
Manfred Karrer
ec494136ed fix windows file rename bug 2014-07-09 13:56:17 +02:00
Manfred Karrer
2778779414 fix windows file rename bug 2014-07-09 13:34:35 +02:00
Manfred Karrer
d221ae3aec fix windows file rename bug 2014-07-09 00:51:06 +02:00
Manfred Karrer
955c2ba4d4 fix windows file rename bug 2014-07-09 00:50:50 +02:00
Manfred Karrer
db4c3d9aa0 change reserve value in Relay. update formattings 2014-07-08 14:41:54 +02:00
Manfred Karrer
64502c54c5 add alert icon to sys tray 2014-07-08 01:11:33 +02:00
Manfred Karrer
d23a965cdc fix app path 2014-07-08 00:39:23 +02:00
Manfred Karrer
5a04af595b packed into mac app 2014-07-07 18:59:55 +02:00
Manfred Karrer
65d97819ac add system try support, add address to create offer screen 2014-07-07 16:28:40 +02:00