Commit Graph

396 Commits

Author SHA1 Message Date
Steve Myers
eaaa0e090c Merge branch 'seedpeer' 2014-10-12 15:53:20 -07:00
Steve Myers
5a3cd72b80 Merged seedpeer branch with master branch, cleanup 2014-10-12 15:43:45 -07:00
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
967eab157e Merge remote-tracking branch 'origin/master' 2014-10-09 20:35:58 +02:00
Manfred Karrer
f31e9b8892 Add test app for DHT storage and loading 2014-10-09 20:35:38 +02:00
Chris Beams
db663db007
Remove obsolete 'apply plugin' Gradle directives
- The 'java' plugin is added implicitly by the gradle/javafx.gradle
   script, so there is no longer a need to explicitly apply it.

 - The 'application' plugin is no longer necessary now that we are
   building native installers with the javafx plugin.
2014-10-09 07:35:38 +02:00
Manfred Karrer
32fb720d2b Use regtest 2014-10-08 14:38:06 +02:00
Manfred Karrer
655c9fb166 Fix URL for screencasts 2014-10-08 01:35:00 +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
df97e3d696 fixing copyright, removed again somehow 2014-10-06 00:46:06 -07:00
Steve Myers
f2e4110235 fixing copyright, removed again somehow 2014-10-06 00:30:08 -07: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
Chris Beams
8746ab74de
Restore GPL copyright header configuration
This partially reverts changes (accidentally) made in fb89f08, restoring
IDEA copyright header configuration files back to their original state
as committed in d5e7b6c.
2014-10-05 19:49:51 +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
0d09b2baf6 Merge pull request #162 from stevemyers/master
Added built in dht seed node
2014-10-05 18:59:37 +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
756966c965 Update README.md 2014-10-03 19:22:04 +02:00
Chris Beams
de35c1ba0c
Merge branch 'native'
This merges the work to generate native installers for Windows, Linux
and OS X using the JavaFX Gradle plugin. See #66 for details.
2014-10-03 18:37:55 +02:00
Chris Beams
153eb5326b
Work around outdated OracleJDK8 on Travis CI server
The Gradle JavaFX plugin requires Oracle JDK 8u20 or better. Travis CI
currently runs something older, and does not have a roadmap for
upgrading. This commit instructs the Travis CI VM to install JDK 8u20
via `apt` prior to actually beginning the build.

See #66
2014-10-03 18:35:58 +02:00
Raúl Álvarez González
bfa585583f
Add icons based on Apple design guidelines
These icons have been added to the src/deploy/package directory, which
is used by the JavaFX Gradle plugin when building native installers.
Icons are designed primarily for clean integration on OS X systems.
Linux and Windows variants can be added at a later time.

The src/deploy/package/shortcut.sketch directory contains sources used
to design the icons.

See #66, #67
Closes #103
2014-10-03 18:35:53 +02:00
Chris Beams
e1889b0697
Update JavaFX Gradle plugin repository config
This commit makes the following improvements upon the stock
javafx.gradle file introduced in the previous commit:

 - Swap Maven Central for JCenter
 - Remove mavenLocal entirely
 - Update naming for clarity

See #66
2014-10-03 18:35:18 +02:00
Chris Beams
d16c2740b6
Generate native installers with Gradle JavaFX plugin
The plugin's jfx* tasks tie into the normal Gradle build lifecycle, such
that `gradle build` will now generate executables and installers
according to the OS on which the build is being run. These files are
output to the `build/distributions` directory.

Installers work as expected OS X and Linux at this point.

Windows installers do build, but a very particular configuration is
necessary on the Windows machine doing the building (this configuration
is to be documented in #109). However, even when the configuration is in
place and the MSI installer is successfully built, there is still a
fatal error at installer execution time relating to a missing
msvp100.dll file. See details at
https://bitbucket.org/shemnon/javafx-gradle/issue/43. An issue has been
created to track this from the Bitsquare side as well--see #108.

The changes made in this commit are based on on the samples at
http://bitbucket.org/shemnon/javafx-gradle and the article at
http://jaxenter.com/tutorial-a-guide-to-the-gradle-javafx-plugin-46270.html

The gradle/javafx.gradle file is copied directly from the sources in the
bitbucket repository above, as is apparently the convention (not sure
why this isn't part of the plugin itself, but that's a question to be
addressed later).

Resolves #66, #100
See #108, #109
2014-10-03 18:32:03 +02:00
Chris Beams
bfd12b4648
Document building from source
Resolves #105
2014-10-03 18:13:15 +02:00
Chris Beams
bdcfabff28
Refine README
See #95
2014-10-03 18:13:15 +02:00
Chris Beams
1031a72e52
Upgrade to BitcoinJ 0.12 GA
Resolves #98
2014-10-03 18:13:14 +02:00
Chris Beams
9727ea21a8
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-03 18:13:14 +02:00
Chris Beams
154641eb40
Merge branch 'docs' 2014-10-03 17:05:55 +02:00
Chris Beams
9c976f1931
Document building from source
Resolves #105
2014-10-03 17:00:50 +02:00
Chris Beams
17cddd0cfc
Refine README
See #95
2014-10-03 17:00:50 +02:00
Chris Beams
18c944da50
Merge pull request #104 from bitcoinj-0.12 2014-10-03 13:59:25 +02:00
Chris Beams
aab3154275
Upgrade to BitcoinJ 0.12 GA
Resolves #98
2014-10-03 09:51:55 +02:00
Chris Beams
6db403b93f
Update and simplify README
Resolves #95
2014-10-02 19:00:21 +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