mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
412 Commits 4 Branches 148 Tags 4.3 GiB
9af8a3b8df
Commit Graph

412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
9af8a3b8df Update to https://bitsquare.io 2014-10-15 20:51:00 +02:00
Manfred Karrer
8d95de3de9 Use portsExternal to fix relay problem with manual port forwarding 2014-10-15 11:16:21 +02:00
Manfred Karrer
793b3d0f37 Pass client port form args 2014-10-15 10:36:59 +02:00
Manfred Karrer
28e1ce4239 Add logs, cleanup 2014-10-15 09:35:17 +02:00
Manfred Karrer
7bf99da595 Use port 5000 for localhost 2014-10-14 23:44:51 +02:00
Manfred Karrer
cf6fa5205f Fix problem with seednode at localhost 2014-10-14 23:40:42 +02:00
Manfred Karrer
f0b4291b8d Merge pull request #223 from bitsquare/tomp2p 
Upgrade to new TomP2P snapshot
 2014-10-14 22:44:47 +02:00
Manfred Karrer
68fc89f3f6 Update to changes in TomP2P snapshot 25 API 2014-10-14 22:44:20 +02:00
Chris Beams
b254ad234a
Upgrade to new TomP2P snapshot 2014-10-14 22:32:10 +02:00
Manfred Karrer
5cb2c2c227 Change bootstrap server 2014-10-14 11:01:30 +02:00
Steve Myers
8983ce1783 Added INET4 binding in BSExampleNAT and Server 2014-10-13 22:04:36 -07:00
Manfred Karrer
5fe25fb411 Change log 2014-10-13 18:02:40 +02:00
Manfred Karrer
6f89a4e727 Merge remote-tracking branch 'origin/master' 2014-10-13 17:58:46 +02:00
Manfred Karrer
75682741b0 Test apps for basic bootstrapping 2014-10-13 17:55:42 +02:00
Chris Beams
f135873f58
Enable Gradle Eclipse project metadata generation 
This commit applies the 'eclipse' Gradle plugin, such that .classpath,
.project and .settings files can be generated using:

    ./gradlew eclipse

Once the above is complete, import the project into Eclipse with the
following command:

    File->Import->Existing projects into workspace

The .gitignore file has been updated accordingly.

Resolves #222
 2014-10-13 12:02:43 +02:00
Chris Beams
5f53fea190
Remove use of Gradle JavaFX plugin 
As documented at [1], version 8.1.1 of the Gradle JavaFX plugin has
disappeared from bintray. This causes Travis CI build failures. Version
8.1.0 is still in place [2], but downgrading to it causes further build
errors.

This commit removes use of the plugin entirely in order to fix the CI
problem immediately. In the meantime, the Bitsquare UI must be launched
directly from within IDEA.

Resolves #221
See #66

[1]: https://bitbucket.org/shemnon/javafx-gradle/issue/46/received-status-code-401-from-server
[2]: http://dl.bintray.com/content/shemnon/javafx-gradle/org/bitbucket/shemnon/javafxplugin/gradle-javafx-plugin/
 2014-10-13 11:13:43 +02:00
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