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

3511 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
c3ba1bf05c
Merge remote-tracking branch 'upstream/master' 2017-10-25 12:17:48 -05:00
Manfred Karrer
96fe221eac
Fix path in build.md 2017-10-20 19:00:13 -05:00
Manfred Karrer
e4060a8967
Merge remote-tracking branch 'upstream/master' 2017-10-20 18:53:29 -05:00
Manfred Karrer
06b0ddf696
Merge remote-tracking branch 'origin/master' 2017-10-20 18:51:24 -05:00
Manfred Karrer
f9635cd7e1
Fix old github repo address 2017-10-20 18:50:31 -05:00
Chris Beams
d29163ce71
Add Editorconfig settings 
Per https://github.com/bisq-network/docs/blob/master/CONTRIBUTING.adoc.

See comments in #959 for details.
 2017-10-13 11:48:24 +02:00
Manfred Karrer
5f93db8957
Merge remote-tracking branch 'upstream/master' 2017-10-12 19:12:07 -05:00
Manfred Karrer
8cc6c01b3d
Merge remote-tracking branch 'origin/master' 2017-10-12 14:23:55 -05:00
Manfred Karrer
b835e7f5a5
Add missing param to log 2017-10-12 13:48:12 -05:00
Manfred Karrer
5dbcd7d4e4
Merge remote-tracking branch 'upstream/master' 2017-10-12 13:35:32 -05:00
Manfred Karrer
302db195ed
Add missing param at log 2017-10-12 13:26:23 -05:00
Manfred Karrer
0c86ae9354
Add Altcoin Ellaism 2017-10-11 07:28:58 -05:00
Manfred Karrer
9732301dbd
Merge branch 'ManfredKarrer-Development2' into Development 2017-10-11 07:23:20 -05:00
Manfred Karrer
4c08fa8679
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange into ManfredKarrer-Development2 2017-10-11 07:22:06 -05:00
Manfred Karrer
01cf823d7a
Prepare merge Dev 2017-10-11 07:21:50 -05:00
Manfred Karrer
e179475bb9
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange 2017-10-11 07:14:01 -05:00
Manfred Karrer
ca71f4464f
Put altcoin Ellaism to right position in list 2017-10-08 21:15:38 -05:00
Manfred Karrer
8ac5d51bdd
Merge branch 'ellaismer-Development' into Development 2017-10-08 21:14:51 -05: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
c6d649f2db
Merge branch 'eljobe-fix-until-misuse' 2017-10-08 21:09:59 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades 2017-10-08 21:03:08 -05:00
Manfred Karrer
361a520048
Remove sum column in market offerbook tables 2017-10-08 20:48:11 -05:00
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
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
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