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

4366 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording 2017-10-08 20:39:09 -05:00
Manfred Karrer
3963924359
Change Maker fee to Trade fee 2017-10-08 20:03:20 -05:00
Manfred Karrer
e26037c59f
Change Taker fee to Trade fee 2017-10-08 20:00:37 -05:00
Manfred Karrer
cb24b973ba
Don't show fee and security deposit fields if BSQ is not enabled 2017-10-08 19:53:52 -05:00
Manfred Karrer
6904c545b0
Improve logging 2017-10-08 19:53:04 -05:00
Pepper Lebeck-Jobe
ec393aea5f
Change "until" to "by" in three places 
This common grammatical error for German-speakers can sound
particularly strange to native English speakers. The rule
is subtle, but these two sentences mean the same thing:
  1. You have until 12am to place your drink order.
  2. You must place your drink order by 12am.
 2017-10-08 17:35:40 +02:00
Manfred Karrer
ab5e8a386b
Merge branch 'eljobe-fix-id-padding' 2017-10-06 21:26:42 -05:00
Manfred Karrer
ec2b941f15
Merge branch 'fix-id-padding' of https://github.com/eljobe/exchange into eljobe-fix-id-padding 2017-10-06 21:26:26 -05:00
Manfred Karrer
15a5f75877
Merge remote-tracking branch 'upstream/Development' into Development 2017-10-06 21:04:53 -05:00
Manfred Karrer
ce25beff5e
Merge master to Development 2017-10-06 21:04:04 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development 2017-10-06 20:57:32 -05:00
Manfred Karrer
2ac1b34996
Disable dev mode 2017-10-06 20:45:27 -05:00
Manfred Karrer
b060766537
Set phase 0 initial genesis tx 2017-10-06 20:45:07 -05:00
Manfred Karrer
fe91c8ee76
Set phase 0 genesis tx 2017-10-06 14:28:50 -05:00
Manfred Karrer
52dd76bd9a
Remove inactive blockexplorer blockr.io 2017-10-06 12:43:59 -05:00
Pepper Lebeck-Jobe
a85611ca4d
Add a paddedId and use it for String concatenation 
See #957 for why this is needed.

Fixes #957
 2017-10-06 16:21:58 +02:00
Mike Rosseel
17b4eefd29
Add swagger annotations to make generated html better 
Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-10-02 09:32:08 +02:00
Manfred Karrer
99dc2f710a
Merge branch 'riclas-patch-6' 2017-09-30 13:16:35 -05:00
riclas
ae4212c567 created properties file for Simplified Chinese from transifex 2017-09-30 19:05:16 +01: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
Manfred Karrer
c3320123c5
Add log for invalid arbitrators 2017-09-25 08:55:55 -05:00
Manfred Karrer
01e0ac3f57
Add equals check and diff for contractAsJson 2017-09-23 11:14:55 -05:00
Manfred Karrer
e73cd7abe2
Fix typos 2017-09-22 08:33:38 -05:00
Mike Rosseel
bc4460bc9e
Merge remote-tracking branch 'origin/Development' into issue544-api 2017-09-22 13:09:06 +02:00
Mike Rosseel
a713c4b502
Change offer_make to take a market_pair argument 
Instead of asking for a baseCurrency and a counterCurrency, the
method now just takes the market_pair (as returned in market_pair
method) and extracts the relevant currencies from that.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-21 17:32:23 +02:00
Manfred Karrer
86c20682e9
Cleanup startup process 2017-09-21 09:03:50 -05:00
Manfred Karrer
570e2ffba0
Increase timeout 2017-09-21 09:02:59 -05:00
Manfred Karrer
96601afb9c
Fix issue #927 2017-09-20 15:52:16 -05:00
Ellaismer
a61f37b6e1 Add Ellaism coin 2017-09-21 04:38:36 +08:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network. 2017-09-20 15:21:13 -05:00
Manfred Karrer
ac0bf80606
Support different keys for code signing in download-tool 2017-09-20 15:05:25 -05:00
Manfred Karrer
981e6814cc
Add Chris Beams' gpg key 5BC5ED73 to resources 2017-09-20 13:07:50 -05:00
Manfred Karrer
a5ab750ce8
Fix bug with missing MultiSigKey 2017-09-20 11:45:24 -05:00
Mike Rosseel
8852eab523
Fix maven warning in api pom 
There was a duplicate entry in the pom, now removed.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 16:31:27 +02:00
Mike Rosseel
4ade734c7e
Change travis config file 
Remove slack notifications for now

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 14:55:06 +02:00
Mike Rosseel
9e04fe4b15
Add missing OfferUtil and fix docs 
Branch did not compile due to missing checkin of the OfferUtil file.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 11:38:33 +02:00
Manfred Karrer
1b324631ae
Rename \'Account holder name\' to \'Account owner full name\' 2017-09-19 20:54:36 -05:00
Manfred Karrer
016626c745
Activate DAO for BTC testnet and regtest 2017-09-19 20:53:51 -05:00
Manfred Karrer
2f459cd05e
Decrease font size and width of Tac window for small screens 2017-09-19 19:18:45 -05:00
Manfred Karrer
e5ac5488f7
Remove not traded altcoins 2017-09-19 18:47:55 -05:00
Mike Rosseel
9a3854bb88
Fix wallet_details balances 
Balances were not calculated correctly, now they are by copying the
code from GUI. This should be extracted in a common class in CORE,
has been noted in a TODO. Given the splitting of api in a separate
repository, I'm wary of adding extra changes to core/gui

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-19 18:18:59 +02:00
Manfred Karrer
4aeea11d63
Rearrange blockexplorers 2017-09-18 13:04:28 -05:00
Manfred Karrer
bc515475e0
Add OXT blockexplorer 2017-09-18 13:03:10 -05:00
Manfred Karrer
0bc339f916
Remove DOGE from base currency selection 2017-09-18 12:53:23 -05:00
Manfred Karrer
c022fadfa4
Reduce seed nodes for LTC and DASH. Remove DOGE seed. 2017-09-18 12:28:47 -05:00
Manfred Karrer
322ffab270
Cleanup 2017-09-18 12:21:48 -05:00
Manfred Karrer
76e031bbb2
Merge Development 2017-09-18 11:48:25 -05:00
Manfred Karrer
23828c3e79
Remove some altcoins, add comment 2017-09-18 11:46:04 -05:00
Manfred Karrer
36b266a204
Add altcoin DEC 2017-09-18 08:59:53 -05:00