mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-26 15:44:54 +01:00
Code Issues Projects Releases Packages Wiki Activity
4460 commits 3 branches 150 tags 4.1 GiB
Commit graph

4460 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roznovjak
668e9758af Update AltCoinAddressValidator.java 
DCT integration
 2017-09-18 14:58:35 +02:00
Mike Rosseel
290d7237f4
Enable overriding the API port number 
Using an environment variable called BISQ_API_PORT, it is now possible
to override the default API port of 8080 to whichever available port
desired.

This enables running the API on a machine where port 8080 is occupied,
it also enables running multiple Bisq instances side-by-side with their
respective API's enabled.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-18 11:39:49 +02:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api 2017-09-18 09:45:22 +02:00
Manfred Karrer
9544095f86
Remove never traded coins 2017-09-17 13:12:12 -05:00
Manfred Karrer
7c45fb78cc
Remove never traded coins 2017-09-17 13:10:34 -05:00
Manfred Karrer
b72d716910
Merge Development 2017-09-17 11:28:34 -05:00
Manfred Karrer
02b9d9153f
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange into Development 2017-09-17 10:33:26 -05:00
Manfred Karrer
70392c21c1
Merge branch 'SMH17-patch-3' into Development 2017-09-17 10:22:37 -05:00
Manfred Karrer
3fe8b848d8
Merge branch 'patch-3' of https://github.com/SMH17/bitsquare into SMH17-patch-3 2017-09-17 10:21:42 -05:00
Manfred Karrer
1ba98d4283
Merge branch 'ManfredKarrer-Development' into Development 2017-09-17 10:19:30 -05: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
0087e19db9
Merge branch 'ZencashOfficial-Development' into Development 
Merge Zencash PR 919
 2017-09-16 12:23:07 -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
Manfred Karrer
c6e5f7882d Merge pull request #924 from Pranacoin/Development 
Add new altcoin with code "PNC"
 2017-09-16 11:08:56 -05:00
Manfred Karrer
71ce1bdade Merge pull request #931 from ManfredKarrer/master 
Fix broken links and remove a developer log
 2017-09-16 10:33:10 -05:00
Manfred Karrer
a9b1a9bd5b
Remove single opening quote in dispute message 2017-09-16 10:31:52 -05:00
Manfred Karrer
13a95317bc
Fix broken link to Arbitration system 2017-09-16 10:25:10 -05:00
Manfred Karrer
9c77da778e
Remove developer log 2017-09-16 10:11:39 -05:00
Mike Rosseel
9e78425e63
Fix broken trade_list result 
The JSON returned from trade_list was not correct, fixed by wrapping it
in [ ] and not generating the ',' character for the last position.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-15 15:48:28 +02: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
Manfred Karrer
b723f28edc Merge remote-tracking branch 'origin/master' 2017-09-13 20:00:04 -05:00
Manfred Karrer
b99b268f12 Update EntryMap_BTC to actual state 2017-09-13 19:59:37 -05: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
Mike Rosseel
d2ac284941 add checks to paymentstarted/received, add countdownlatches where necessary. 2017-09-05 16:29:24 +02:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange} 
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
 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
d826efc984 update dependencies to fix the build 2017-09-04 14:23:16 +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
Manfred Karrer
902e3de80a Rename ShadowCash to Particl (https://github.com/bisq-network/bisq-exchange/issues/911) 2017-08-27 12:42:01 +02:00
Manfred Karrer
1eee939754 Merge pull request #912 from stevenkain/patch-4 
Update displayStrings.properties
 2017-08-26 09:41:45 +02:00
stevenkain
2fb74f4936 Update displayStrings.properties 2017-08-25 23:35:15 +03:00
stevenkain
aa87319fca Update displayStrings.properties 2017-08-25 23:34:30 +03:00
stevenkain
50310338b4 Update displayStrings.properties 2017-08-25 23:05:06 +03:00
Chris Beams
ede1f90167
Upgrade to latest HEAD of our libdohj fork 2017-08-23 15:43:36 +02:00
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