Commit graph

445 commits

Author SHA1 Message Date
Steve Myers
7c823714b4 Merged seedpeer branch with master branch, cleanup 2014-10-12 15:21:23 -07:00
Steve Myers
bec9a68750 Merged seedpeer branch with master branch, cleanup 2014-10-12 14:56:52 -07:00
Steve Myers
f8b9408514 Merged seedpeer branch with master branch
Conflicts:
	src/main/java/io/bitsquare/BitSquare.java
	src/main/java/io/bitsquare/gui/main/MainModel.java
2014-10-12 13:07:28 -07:00
Manfred Karrer
f31e9b8892 Add test app for DHT storage and loading 2014-10-09 20:35:38 +02:00
Manfred Karrer
32fb720d2b Use regtest 2014-10-08 14:38:06 +02:00
Manfred Karrer
4d33eeb738 Add testnet and main net fee addresses 2014-10-08 00:45:11 +02:00
Manfred Karrer
32d482eb22 Use custom Download indicator, fix problems with testnet 2014-10-08 00:30:44 +02:00
Manfred Karrer
e2cdc517e4 Use BlockdownloadPane from wallettemplate 2014-10-07 22:56:43 +02:00
Steve Myers
b4cd7467b2 moved UI Application to BitSquareUI class so BitSquare class can startup as seed peer on headless server. 2014-10-07 09:24:44 -07:00
Steve Myers
ce1b57d87a Remove JFx service from seed node startup 2014-10-06 11:33:24 -07:00
Manfred Karrer
2eb5428ed9 Fix wrong type in BSResource, Change wording 2014-10-06 17:58:17 +02:00
Manfred Karrer
e054b2ef3d Use local seed node 2014-10-06 14:45:49 +02:00
Manfred Karrer
f485afec19 Fix bug with add info popup for first time user at take offer screen 2014-10-06 11:58:48 +02:00
Manfred Karrer
aa66d591ab Add info popup for first time user at take offer screen 2014-10-06 11:57:17 +02:00
Manfred Karrer
009a4daff3 Change min app size 2014-10-06 11:54:13 +02:00
Steve Myers
47232eebc2 Added command line arguments parser and flag to start app in seed mode. Also added default properties loader, but not using it yet. 2014-10-05 23:53:49 -07:00
Manfred Karrer
d19be95a75 Change setup for serverside seednode with BootstrappedPeerFactory 2014-10-05 23:23:49 +02:00
Manfred Karrer
a8a3378268 Make seednode working with current TomP2P implementation 2014-10-05 20:18:40 +02:00
Chris Beams
0d048de7fc
Add missing GPL headers
Per 8746ab7, IDEA's copyright configuration had been wiped out for some
time. Now that it is back in place, this change is the result of a
global "Update copyright..." action (with a bit of pruning afterward).
2014-10-05 20:00:38 +02:00
Manfred Karrer
840cb547e4 Use "-" instead of "_" in app name when application arguments are used (Bitsquare-Alice) as Akka does not allow "_" in AkkaSystem names. 2014-10-05 19:17:37 +02:00
Manfred Karrer
c9b55c549f Merge branch 'master' of https://github.com/bitsquare/bitsquare 2014-10-05 18:59:52 +02:00
Manfred Karrer
89b7dac5b8 Moved window icon code to main class 2014-10-05 18:56:13 +02:00
Steve Myers
5e9f97953f Added built in dht seed node 2014-10-04 19:19:18 -07:00
Manfred Karrer
864c7a15db Fix bug with mining fee 2014-10-03 22:21:23 +02:00
Chris Beams
18c944da50
Merge pull request #104 from bitcoinj-0.12 2014-10-03 13:59:25 +02:00
Chris Beams
041d8ec7a7
Upgrade to BitcoinJ 0.12-SNAPSHOT
- Update imports to reflect BitcoinJ's repackaging, including:

   git grep -l 'import com.google.bitcoin' | \
   xargs perl -p -i -e 's/import com.google.bitcoin/import org.bitcoinj/'

   git grep -l 'com.google.bitcoin' | \
   xargs perl -p -i -e 's/com.google.bitcoin/org.bitcoinj/'

 - Replace use of BitcoinJ's CoinFormat, which has now been renamed to
   MonetaryFormat, using:

   git grep -l 'CoinFormat' | \
   xargs perl -p -i -e 's/CoinFormat/MonetaryFormat/g'

 - Fix calls to BitcoinJ's Script#correctlySpends, whose signature has
   changed from 0.11 => 0.12.

See #98
2014-10-02 16:07:27 +02:00
Manfred Karrer
0ef491ac58 Fix bug with collateral 2014-10-02 15:24:35 +02:00
Manfred Karrer
d20a9306ee Add icons 2014-10-02 14:45:04 +02:00
Manfred Karrer
b9b7d4b3e0 Improve usability, fix bugs 2014-10-02 14:30:05 +02:00
Manfred Karrer
1745a27d5f Fix withdrawal list update problems and payout amount 2014-09-30 21:38:23 +02:00
Manfred Karrer
3c05af90f2 Improve UI 2014-09-30 15:49:01 +02:00
Manfred Karrer
8d5488b633 Link help to dummy help page 2014-09-29 13:07:35 +02:00
Manfred Karrer
0b808e529b Update tagline 2014-09-29 12:09:47 +02:00
Manfred Karrer
d03d1cf760 Add under construction messages, deactivate not implemented features, update logo 2014-09-29 12:04:33 +02:00
Manfred Karrer
ba3d04fed1 Add config file support for seednode selection, Fix resource loading bug with checkpoint file for mainnet 2014-09-29 03:01:01 +02:00
Manfred Karrer
a5a04fe72c Add config file support for network type selection 2014-09-29 01:44:50 +02:00
Manfred Karrer
d2b1c5f37c Add window icon, change texts, remove balance display 2014-09-28 03:31:27 +02:00
Manfred Karrer
14b452efc3 Fine tune trade process 2014-09-27 01:39:55 +02:00
Manfred Karrer
026a3e4b93 Remove deprecated method from Formatter 2014-09-26 14:23:35 +02:00
Manfred Karrer
87d89f2dc6 Move arbitration screens to new account tab 2014-09-26 14:20:04 +02:00
Manfred Karrer
9ea6fb9b55 Remove old Controller classes 2014-09-26 11:42:12 +02:00
Manfred Karrer
33148a9a8a Clean up orders package 2014-09-26 11:18:11 +02:00
Manfred Karrer
1130da6a8f Remove static methods from BSFormatter 2014-09-26 10:36:51 +02:00
Manfred Karrer
19e71ffad2 Remove BitSquareValidator (was deprecated) 2014-09-26 10:04:07 +02:00
Manfred Karrer
a7e6fd96c7 Remove TomP2P dependency in ArbitratorBrowser 2014-09-26 09:57:17 +02:00
Manfred Karrer
d207b65cc7 Remove deposit screen (not needed anymore as deposit are done in context) 2014-09-26 09:35:22 +02:00
Manfred Karrer
a4fd70f49b Add null check 2014-09-26 02:34:21 +02:00
Manfred Karrer
da2e7fd968 Reformatting 2014-09-26 02:24:24 +02:00
Manfred Karrer
299589ccf4 Add notifiaction logos 2014-09-26 02:23:54 +02:00
Manfred Karrer
76b6bcfc22 Cleanup 2014-09-26 02:21:34 +02:00