Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange
2017-08-23 15:36:17 +02:00
Chris Beams
391910576b
Update to depend on latest commit in libdohj-core
...
Depending on this commit ensures that we do not transitively depend on
bitcoinj snapshots.
2017-08-21 16:22:11 +02:00
WACoinsTeam
41450d7543
Add WACoins coin
2017-08-20 21:51:54 +02:00
Manfred Karrer
8747f0e099
Merge pull request #904 from stevenkain/patch-3
...
Update displayStrings.properties
2017-08-10 16:17:49 +02:00
stevenkain
a3b1a5ff6a
Update displayStrings.properties
...
Senders name -> Sender's name
2017-08-10 16:54:45 +03:00
Manfred Karrer
79f31f56ae
Merge pull request #901 from stevenkain/patch-2
...
Update displayStrings.properties
2017-08-09 18:37:36 +02:00
stevenkain
fd683db2d4
Update displayStrings.properties
2017-08-09 19:14:42 +03:00
Manfred Karrer
a7c0f1d16f
Merge branch 'Development' into DAO_phase1
2017-08-09 12:48:56 +02:00
Manfred Karrer
e8c46c9709
Merge branch 'master' into Development
...
# Conflicts:
# doc/build.md
2017-08-09 12:48:07 +02:00
Chris Beams
6ece78352f
Replace snapshot versions of JitPack deps with fixed SHAs ( #899 )
2017-08-09 12:41:18 +02:00
Chris Beams
ae05c015b9
Consume custom bitcoinj/libdojh/btcd deps via JitPack ( #899 )
...
This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
2017-08-09 12:13:47 +02:00
Chris Beams
3f19fe3065
Send Travis success notifications to Slack only on status change ( #898 )
...
Previously every successful build was triggering a notification to be
sent to Slack, and this is too noisy.
2017-08-09 10:27:10 +02:00
Chris Beams
3b73516ad6
Pin maven-enforcer-plugin version to 1.4.1 ( #897 )
...
A new version (v3.0.0-M1) of the enforcer plugin was released on July
27th. If for whatever reason that new version ends up in the local ~/.m2
cache, it results in broken builds because the new version's checksum
gets validated instead of the older v1.4.1 checksum being validated.
This is because the version provided to check was set simply to
'RELEASE', i.e. an alias indicating "whatever the latest release happens
to be". This commit fixes #897 and avoids these potential build failures
by pinning the version explicitly to v1.4.1. This forces the correct
checksum to get validated, in turn causing the build to pass as
expected.
2017-08-09 10:15:14 +02:00
Chris Beams
145bce6bf3
Send Travis CI notifications to Slack ( #898 )
...
Per instructions at
https://docs.travis-ci.com/user/notifications#Configuring-slack-notifications
2017-08-09 10:08:42 +02:00
Chris Beams
9c0469eb7e
Polish .travis.yml formatting
2017-08-09 10:08:42 +02:00
Chris Beams
f7a8fd19f0
Remove commented-out Travis IRC notification config
2017-08-09 10:08:42 +02:00
Manfred Karrer
9cfbba2013
Merge pull request #895 from stevenkain/patch-1
...
Update displayStrings.properties
2017-08-04 21:17:35 +02:00
stevenkain
c92f955060
Update displayStrings.properties
2017-08-04 21:57:03 +03:00
Manfred Karrer
2dee533d37
Set onAction in activate method
2017-07-29 03:16:57 +02:00
Manfred Karrer
94203b9101
Add BSQ dashboard/statistics
2017-07-29 03:09:39 +02:00
Manfred Karrer
2a67d39d53
Cleanup
2017-07-29 00:04:31 +02:00
Manfred Karrer
594fe882d9
update dev input field data
2017-07-28 20:04:57 +02:00
Manfred Karrer
5b5c0e66c7
Improve wording
2017-07-28 20:04:38 +02:00
Manfred Karrer
db865800fb
Check for null and 0 values at setting market price
2017-07-28 13:37:26 +02:00
Manfred Karrer
50065bb5c9
Use BSQ testnet explorer for testnet
2017-07-28 01:32:44 +02:00
Manfred Karrer
6cee58824e
Add new mainnet geneis tx. Make genesisTx nullable in BsqChainState. Shuffle seedNodeAddresses and remove candiates from list. Add null checks. Filter invlaid OP_RETURN data.
2017-07-28 00:40:17 +02:00
Manfred Karrer
667ad0bc95
Update btc conf file with stricter access
2017-07-27 19:48:37 +02:00
Mike Rosseel
c6f11429f1
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 18:44:28 +02:00
Mike Rosseel
79d6fe22a4
offer_take is code complete but needs to be tested further.
2017-07-27 18:44:02 +02:00
Manfred Karrer
473da57db1
Fix pom files (BC not included)
2017-07-27 18:14:34 +02:00
Manfred Karrer
b593f89638
Add BTC TESTNET genesis tx, remvoe LTC genesis txs
2017-07-27 18:00:48 +02:00
Manfred Karrer
0016e33640
Add network selector to resource EntryMap file name
2017-07-27 18:00:18 +02:00
Manfred Karrer
2e8030cfb4
Add default configs
2017-07-27 17:59:05 +02:00
Manfred Karrer
2f322f7a33
Merge branch 'Development' into DAO_phase1
2017-07-27 17:12:24 +02:00
Manfred Karrer
2d6fa2be6f
Move removeCryptographyRestrictions method to Utilities and add static initializer to SeedNodeMain, ProviderMain and StatisticsMain
2017-07-27 17:12:14 +02:00
Manfred Karrer
53de6ee4ad
Append bisq to check out command
2017-07-27 11:51:15 +02:00
Manfred Karrer
4ee0ebe127
Add command for git checkout of bisq
2017-07-27 11:50:35 +02:00
Mike Rosseel
3f4c607b33
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 08:43:09 +02:00
Mike Rosseel
779d388070
Merge branch 'Development' into issue544-api
2017-07-27 08:42:56 +02:00
Manfred Karrer
5af504095e
Fix bug with sorting offers
...
https://github.com/bitsquare/bitsquare/issues/869#issuecomment-318004502
2017-07-27 01:10:07 +02:00
Silvio Marano
69efbaf00e
Update Bisq.iss
...
the lines
SetupIconFile={localappdata}\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq.ico
are wrong, Bisq folder is located in {localappdata} and the icons are inside Bisq\ path so a more coherent change would be
SetupIconFile={localappdata}\Bisq\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq\Bisq.ico
but even this would be wrong since SetupIconFiledirective as it is used on compile time only and should contain the absolute path to the icon
Same issue on `WizardSmallImageFile={localappdata}\Bisq-setup-icon.bmp `
2017-07-26 21:47:01 +02:00
Manfred Karrer
c744cb5a96
Merge branch 'Development' into DAO_phase1
2017-07-26 21:38:21 +02:00
Manfred Karrer
33284a8abd
Merge pull request #890 from SMH17/patch-2
...
Update Bisq.iss
2017-07-26 21:36:15 +02:00
Silvio Marano
0d965d3749
Update Bisq.iss
...
the lines
SetupIconFile={localappdata}\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq.ico
are wrong, Bisq folder is located in {localappdata} and the icons are inside Bisq\ path
so a more coherent change would be
SetupIconFile={localappdata}\Bisq\Bisq.ico
UninstallDisplayIcon={localappdata}\Bisq\Bisq.ico
but even this would be wrong since SetupIconFile directive as it is used on compile time only and should contain the absolute path to the icon
2017-07-26 21:24:15 +02:00
Mike Rosseel
592bea9dad
make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test
2017-07-26 16:37:59 +02:00
Mike Rosseel
3747ac5db0
add support script
2017-07-26 16:35:41 +02:00
Mike Rosseel
b3335ae25e
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-26 16:34:51 +02:00
Mike Rosseel
5e58853d9c
adding trade_detail, trade_list, payment_started, payment_received and move_funds_to_bisq_wallet
2017-07-26 16:34:27 +02:00
Manfred Karrer
ba2fc3c162
Merge branch 'Development' into DAO_phase1
2017-07-26 13:21:07 +02:00
Manfred Karrer
88243866dd
Merge remote-tracking branch 'origin/Development' into Development
2017-07-26 13:17:15 +02:00
