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
4435 commits 3 branches 150 tags 4.1 GiB
Commit graph

4435 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
175c1e4b96
Add AccountAgeWitnessMap to PB (WIP) 2017-10-06 13:58:35 -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
6de0355a4f
Add AccountAgeWitness to PB 2017-09-25 13:07:10 -05:00
Manfred Karrer
efcc7ff05c
Remove accountSalt from trade messages and TradePeer 2017-09-25 12:47:09 -05:00
Manfred Karrer
952c0d00ad
Add accountSalt to tradingPeer 2017-09-25 12:27:56 -05:00
Manfred Karrer
5d960dd901
Change comments 2017-09-25 12:17:29 -05:00
Manfred Karrer
68badcbcc8
Change name of IOP to Internet Of People 2017-09-25 12:13:38 -05:00
Manfred Karrer
94e2c1bf66
Remove dev value for accountSalt 2017-09-25 11:16:00 -05:00
Manfred Karrer
6274b646ed
Move salt from PaymentAccount to PaymentAccountPayload 2017-09-25 11:10:49 -05:00
Manfred Karrer
091e766e21
Add RestrictedByContractJson interface 2017-09-25 09:41:29 -05:00
Manfred Karrer
791c16a2e6
Add module consensus 2017-09-25 09:41:10 -05:00
Manfred Karrer
d349acb09e
Fix comments 2017-09-25 09:31:07 -05:00
Manfred Karrer
b667e1b18a
Rename PaymentAccountAgeWitnessService to AccountAgeWitnessService 2017-09-25 09:16:01 -05:00
Manfred Karrer
fb5b8ecc0f
Rename PaymentAccountAgeWitness to AccountAgeWitness 2017-09-25 09:15:20 -05:00
Manfred Karrer
ea1666a665
Rename getPayload to createPayload in PaymentAccount 2017-09-25 09:14:29 -05:00
Manfred Karrer
8c7e1fd04a
Add verification methods, add hash to offer, add salt to trde process (WIP) 2017-09-25 09:13:23 -05:00
Manfred Karrer
4ef8309153
Add TakerVerifyOffersAgeWitnessHash to taker protocols 2017-09-25 09:12:02 -05:00
Manfred Karrer
c3320123c5
Add log for invalid arbitrators 2017-09-25 08:55:55 -05:00
Manfred Karrer
6d1a40dbd5
Merge branch 'Development' into PaymentAccountAgeVerification 2017-09-23 11:15:37 -05:00
Manfred Karrer
01e0ac3f57
Add equals check and diff for contractAsJson 2017-09-23 11:14:55 -05:00
Manfred Karrer
007142ed9b
Add AgeWittness domain (WIP) 2017-09-23 10:08:32 -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
fcd3106eb4
Remove comment 2017-09-21 09:57:33 -05:00
Manfred Karrer
af27682f2f
Merge Development 2017-09-21 09:56:01 -05: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