Mike Rosseel
c79d9e992c
Reverting non-relevant changes
2017-10-12 16:12:21 +02:00
Mike Rosseel
0755cac9d1
Merge remote-tracking branch 'origin/Development' into api-pr1
...
Conflicts:
common/src/main/java/io/bisq/common/locale/LocaleUtil.java
2017-10-11 14:38:34 +02:00
Manfred Karrer
01cf823d7a
Prepare merge Dev
2017-10-11 07:21:50 -05:00
Mike Rosseel
fbfb9ccc50
Merge branch 'Development' into issue544-api
2017-10-09 16:11:37 +02:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development
2017-10-08 21:12:02 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development
2017-10-06 20:57:32 -05:00
Manfred Karrer
e6498e2659
Remove pre-filled entries in ManualPayoutTxWindow
2017-09-26 09:06:12 -05:00
Manfred Karrer
da2b12f71a
Rename SpendFromDepositTxWindow to ManualPayoutTxWindow
2017-09-26 08:47:55 -05:00
Mike Rosseel
bc4460bc9e
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-22 13:09:06 +02:00
Ellaismer
a61f37b6e1
Add Ellaism coin
2017-09-21 04:38:36 +08:00
Roznovjak
8e7e720bb7
Update AltCoinAddressValidatorTest.java
...
DCT integration
2017-09-18 15:03:03 +02:00
Roznovjak
668e9758af
Update AltCoinAddressValidator.java
...
DCT integration
2017-09-18 14:58:35 +02:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-09-18 09:45:22 +02:00
Manfred Karrer
1aa3038a07
Merge WACoin
2017-09-17 10:16:00 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development
...
Merge master to Development
2017-09-16 12:28:49 -05:00
Manfred Karrer
7daee4f212
Remove comment
2017-09-16 12:22:20 -05:00
Manfred Karrer
262c947d85
Merge PR 919 (ZenCash)
2017-09-16 12:16:54 -05:00
Mike Rosseel
7e980c1ad2
Fix an offer_make issue, add wallet tx support, remove offer_take param
...
This fixes an offer_make issue, but there is still one left.
General cleanup of model files/parameters no longer needed.
Remove offer_take savings_wallet param because it's always implied,
external wallets are not yet supported.
Signed-off-by: Mike Rosseel <mike@eon-consult.be>
2017-09-14 12:09:41 +02:00
Казьмина Татьяна
daaeddb968
Add new altcoin with code "PNC": additional code in AltCoinAddressValidator and AltCoinAddressValidatorTest and 2 specific classes: PNCAddressValidator and PNCParams.
2017-09-09 15:23:00 +03:00
smrtz
728e178828
Adds ZenCash Support
2017-09-05 18:38:59 -04:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange}
...
This is a follow on to 6ffa52a00
2017-09-05 14:55:42 +02:00
Mike Rosseel
68a7e7c9c5
check that the corrent paymentaccount is used for this offer
2017-09-04 19:59:40 +02:00
Mike Rosseel
9101aa367b
fix startup issues in some cases, where the p2pservice calls an onmessage before the storagefile is initialised.
...
Aligning Api module with other modules by using the AppSetupWithP2P class.
2017-09-04 13:26:56 +02:00
Mike Rosseel
46641200bc
adding more checks to offer_make, provide a cleaner/easier feedback mechanism between proxy/api.
...
Use threading to wait for offer creation results, add callback for errors.
Most exceptions coming from the bisq code are now propagated to the api result.
Added market check to forbid offers on non-existing markets.
TODO: further testing of rest api, adding checks
2017-09-02 11:39:27 +02:00
Mike Rosseel
9456b00127
Merge branch 'Development' into issue544-api
2017-08-28 09:31:45 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange
2017-08-23 15:36:17 +02:00
WACoinsTeam
41450d7543
Add WACoins coin
2017-08-20 21:51:54 +02:00
Manfred Karrer
e8c46c9709
Merge branch 'master' into Development
...
# Conflicts:
# doc/build.md
2017-08-09 12:48:07 +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
Mike Rosseel
c6f11429f1
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-27 18:44:28 +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
Mike Rosseel
6d782cdd73
adding command-line switch to GUI, ENABLE_API
2017-07-25 18:31:11 +02:00
Mike Rosseel
0c1cf298f6
Merge remote-tracking branch 'origin/Development' into issue544-api
2017-07-25 13:35:13 +02:00
Manfred Karrer
614344218f
Use url instead of file name for log at daownloader
2017-07-23 01:58:26 +02:00
Mike Rosseel
412e19923c
utility scripts
2017-07-20 16:38:49 +02:00
Mike Rosseel
47a5e85e5f
api headless startup - wip
2017-07-20 14:38:03 +02:00
Mike Rosseel
537a99eb0f
adding healthchecks, adapting offer_make to new ctor (wip), adding banner, start of swagger integration
2017-07-18 17:32:44 +02:00
Mike Rosseel
337610ef7c
Merge branch 'Development' into issue544-api
2017-07-17 13:19:24 +02:00
Manfred Karrer
a7f3d68cb1
Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir).
2017-07-17 10:05:08 +02:00
Mike Rosseel
cda82172e3
Merge branch 'Development' into issue544-api
...
Conflicts:
.idea/codeStyleSettings.xml
2017-07-17 09:03:15 +02:00
Manfred Karrer
6c1e803220
Improve check for showing popup
2017-07-16 23:11:05 +02:00
Manfred Karrer
2fe77aadd4
Optimize startup performance
2017-07-16 22:39:15 +02:00
Manfred Karrer
b7d8a0acb6
set version 0.5.2
2017-07-16 16:29:10 +02:00
Manfred Karrer
a2563fd0d4
Cleanup, improve comments, small refactorings
2017-07-16 16:06:05 +02:00
Manfred Karrer
fde3d7d542
Add try/catch
2017-07-16 16:05:42 +02:00
Manfred Karrer
71115d46df
Update key
2017-07-16 15:32:31 +02:00
Manfred Karrer
68042b3c1e
Ignore test
2017-07-16 03:30:18 +02:00
Manfred Karrer
0b6c3c04da
Fix tests
2017-07-16 03:29:52 +02:00
Manfred Karrer
782a5b87ce
Backup file if there is an existing file. Filter duplicate sig.
2017-07-16 03:11:45 +02:00
Manfred Karrer
25f9368990
Add info for wallet restore
2017-07-16 02:35:03 +02:00
