Commit Graph

1006 Commits

Author SHA1 Message Date
Manfred Karrer
da2e13d0b1 Revert changes fro BitcoinJ 0.12.2 2015-02-15 21:44:09 +01:00
Manfred Karrer
981ae03ac6 Update to Tomp2p beta3 and back to BitcoinJ 0.12.2 2015-02-15 18:01:22 +01:00
Manfred Karrer
309cda7143 Active relay mode (working!) 2015-02-15 00:05:49 +01:00
Manfred Karrer
9c75b9951b Change BitcoinJ timeout 2015-02-14 22:44:07 +01:00
Manfred Karrer
61b0bfbe9c Update to latest BitcoinJ master 2015-02-14 22:23:48 +01:00
Manfred Karrer
b72c5aaebf Change formatting rule RIGHT_MARGIN 2015-02-14 22:11:02 +01:00
Manfred Karrer
d0295d7997 Add log to file 2015-02-14 22:10:13 +01:00
Manfred Karrer
c506bc420b Update to TomP2P master 2015-02-14 22:09:19 +01:00
Manfred Karrer
bb898282ca Merge pull request #334 from joeschmid/tomp2p-5.0-Beta2
Updated project to use 5.0-Beta2 of tomp2p
2015-02-14 22:05:08 +01:00
Joe Schmid
089007a498 Updated project to use 5.0-Beta2 of tomp2p
Note that this has not been thoroughly tested and, in particular, my router does not support UPnP so I've only been able to test with --node.useManualPortForwarding=true  The project does compile and run successfully though. With manual port forwarding I'm able to connect to the p2p network and view open offers successfully.
2015-02-06 22:54:16 -05:00
Manfred Karrer
b0cbfaed6d Merge pull request #331 from msgilligan/master
Use https URL for artifactoryonline.com
2014-12-22 13:01:08 +01:00
Sean Gilligan
fd6b78f069 Use https URL for artifactoryonline.com 2014-12-22 00:11:16 -08:00
Manfred Karrer
d620e46219 Merge remote-tracking branch 'origin/master' 2014-12-21 01:17:54 +01:00
Manfred Karrer
f5282fc3d6 Open blockexplorer for address 2014-12-21 01:17:44 +01:00
Chris Beams
b13848154a Use "national currency" vs "fiat" where appropriate 2014-12-17 22:36:38 +01:00
Manfred Karrer
a7069ee467 Add updateFX 2014-12-17 17:57:55 +01:00
Manfred Karrer
426b38180c Integrate UpdateFX with MockUpdateProcess 2014-12-17 17:41:58 +01:00
Manfred Karrer
2e97e900e5 Add icons for update 2014-12-17 17:40:42 +01:00
Manfred Karrer
b440469ba7 Add timeout handling 2014-12-17 17:39:20 +01:00
Manfred Karrer
c17c08b07a Update video link 2014-12-16 02:41:33 +01:00
Chris Beams
80990fab50
Increment development version to 0.1.1-SNAPSHOT 2014-12-15 10:58:41 +01:00
Steve Myers
5beffbe164 reverted add $JAVA_HOME for #292 2014-12-12 13:03:52 -08:00
Chris Beams
dc99a8cb15
Release Bitsquare v0.1.0 2014-12-11 18:50:13 +01:00
Chris Beams
e79c19d70f
Link to user guide on GH wiki vs docs.bitsquare.io 2014-12-11 18:50:13 +01:00
Chris Beams
beb4645118
Polish connection/sync status and error messages
Relates to #320
2014-12-11 18:12:26 +01:00
Manfred Karrer
04d22e0380 Change timeout to 20 sec. 2014-12-11 16:04:19 +01:00
Manfred Karrer
70f75dd953 Add error msg in case of bitcoin network problems #320 2014-12-11 16:03:48 +01:00
Manfred Karrer
25cac42700 Reset persisted data if there is a serialisation problem #319 2014-12-08 19:00:20 +01:00
Manfred Karrer
39524719ee Display better error msg when there are network problems #318 2014-12-08 14:45:30 +01:00
Steve Myers
67ed736652 added $JAVAHOME/bin to linux.sh to work with Jenkins #292 2014-12-03 17:27:06 -08:00
Manfred Karrer
7fb80c1a50 Merge remote-tracking branch 'origin/master' 2014-12-04 01:04:51 +01:00
Manfred Karrer
a1b544a753 Removed mentioning of IRC 2014-12-04 01:04:44 +01:00
Steve Myers
acae09886c increased jvm memory in gradle.properties to 1024m 2014-12-03 13:13:51 -08:00
Steve Myers
c5b40da96d added daemon=true to gradle.properties 2014-12-03 13:06:25 -08:00
Steve Myers
21f24e5864 added gradle.properties with -Xmx512m for jenkins 2014-12-03 13:03:59 -08:00
Chris Beams
e11d183a6e
Remove coveralls badge for now 2014-12-02 18:02:51 +01:00
Manfred Karrer
10d90d3d64 Handle Close button in popup title #300 2014-12-01 20:37:57 +01:00
Manfred Karrer
5645f9ba10 Add isOnline check at take offer screen #313, fix #315 2014-12-01 02:57:23 +01:00
Manfred Karrer
f903491abb Remove registration for alpha version #303 2014-12-01 00:39:27 +01:00
Manfred Karrer
daea94c178 Remove country flag in offerbook for alpha verison #302 2014-12-01 00:06:50 +01:00
Manfred Karrer
1726e1fc87 Use custom timeout for bootstrap node 2014-11-28 19:38:08 +01:00
Manfred Karrer
5ff335f15f Merge pull request #297 from bitsquare/cbeams
Use custom .iss file to embed missing .dll files in Windows installer binary
2014-11-28 12:47:53 +01:00
Chris Beams
533c6ba676
Configure the inclusion of missing .dll files 2014-11-28 11:32:21 +01:00
Chris Beams
040571421a
Customize AppId and PublicationUrl entries 2014-11-28 11:32:21 +01:00
Chris Beams
8db981c138
Add Bitsquare.iss file as produced by javapackager
This file was produced by adding a `-v` flag following the `-deploy`
flag in `package/windows.bat`. The creation of the file is reported by
javapackager as follows:

    Config files are saved to
    C:\Users\CBEAMS~1.WIN\AppData\Local\Temp\fxbundler5661616451276716144\windows.
    Use them to customize package.

Subsequent commits will customize this file, primarily for the purpose
of avoid the dreaded 'missing dll' errors mentioned originally in
d16c274 and detailed at https://bitbucket.org/shemnon/javafx-gradle/issue/43.
2014-11-28 11:32:20 +01:00
Manfred Karrer
c8a6c8b330 Cleanup 2014-11-27 12:54:17 +01:00
Chris Beams
7dbe3e33b1
Upgrade to the newly-released RxJava 1.0.0
See https://github.com/ReactiveX/RxJava/releases/tag/v1.0.0
2014-11-27 11:09:37 +01:00
Chris Beams
75babebc8b
Return void from TradeView#loadView
The return value of #loadView is never used. Return void to more clearly
reflect this fact.
2014-11-27 10:36:08 +01:00
Chris Beams
1ce151821a Merge pull request #296 from bitsquare/cbeams
Add support for $HOME/.bitsquare/bitsquare.properties
2014-11-27 10:26:18 +01:00
Chris Beams
3c50a3c4f2
Add support for $HOME/.bitsquare/bitsquare.properties
This change allows users to place a bitsquare.properties file within
a `.bitsquare` directory under their home directory. This makes it
possible to specify property values (such as
node.useManualPortForwarding=true) that will survive cleaning the
application data dir (e.g. with `--clean=true` flag as introduced
in #291).

The precedence of this new "homeDirProperties" property source is lower
than the "appDirProperties" property source.

This means that if a user has a `bitsquare.properties` file both in his
home directory and in his application data directory, both files will be
processed, but for any properties that exist in both files, the property
specified in the application data directory file will take precedence.
This arrangement allows users to customize settings on an app-by-app
basis, which is especially useful in local testing scenarios where more
than one Bitsquare instance is running.
2014-11-27 10:19:21 +01:00