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

3092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
0eccfb87cc Merge branch 'master' into Development 
# Conflicts:
#	gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
 2016-11-06 23:23:00 +01:00
Manfred Karrer
021e13d602 Increase column width 2016-11-06 23:20:31 +01:00
Manfred Karrer
c448f4c9c0 Merge pull request #693 from riclas/master 
Add portuguese translation
 2016-11-06 21:20:12 +01:00
riclas
dd0e914715 Add portuguese translation 2016-11-06 19:49:02 +00:00
Manfred Karrer
c767b7faa2 Remove dangling trades when dispute was already closed 2016-11-06 19:58:16 +01:00
Manfred Karrer
c58ec43e46 Added Smileycoin, RealEst. Coin 2016-11-04 14:28:18 +01:00
Manfred Karrer
2d1d3251c3 Merge branch 'master' into Development 2016-11-04 14:25:30 +01:00
Manfred Karrer
e9f3381034 Make onion address selectable in peer info popup, fix wording, fix comment 2016-11-04 13:48:19 +01:00
Manfred Karrer
36e382cf34 Merge pull request #690 from HostFat/master 
New blockexplorers
 2016-11-04 12:39:11 +01:00
HostFat
44caef6664 Missing commas 2016-11-04 05:16:54 +01:00
HostFat
b724e1af8d Added some blockexplorers 2016-11-04 05:13:49 +01:00
Manfred Karrer
4e7f44a213 Revert change of WalletAppKit 2016-11-03 21:13:03 +01:00
Manfred Karrer
c239b37b59 Add notification support to dispute view 2016-11-03 21:08:11 +01:00
Manfred Karrer
73dc71ca38 Merge pull request #689 from shivaenigma/master 
Added blockonomics to blockexplorer list
 2016-11-03 12:46:37 +01:00
Shiva Sitamraju
5a470d14c7 Fixed order of arguments when adding blockonomics as blockexplorer 2016-11-03 17:10:45 +05:30
Shiva Sitamraju
84950e60aa Added blockonomics to blockexplorer list 2016-11-03 15:59:52 +05:30
Manfred Karrer
5a53ff39e0 Merge branch 'Development' into SQUWallet 2016-11-02 22:52:49 +01:00
Manfred Karrer
c1970a88a6 Fix bug with not supporting to restore seed words if current wallet files creation date is not matching original date 2016-11-02 22:48:04 +01:00
Manfred Karrer
d400573e9b Add code for WalletAppKit to WalletAppKitBitSquare 2016-11-01 18:34:31 +01:00
Manfred Karrer
01dcc4f2dc Add check for withdrawal in case the fees exceeds the available funds 2016-10-31 12:35:03 +01:00
Manfred Karrer
0480e44fd7 Update code style settings 2016-10-31 12:34:08 +01:00
Manfred Karrer
515491681f Update build script 2016-10-30 23:24:44 +01:00
Manfred Karrer
d4494d7325 Increase column width for date in trades statistics view 2016-10-30 17:26:12 +01:00
Manfred Karrer
930dbb44ed Fix wording 2016-10-30 17:08:15 +01:00
Manfred Karrer
99ce47beb4 Merge pull request #683 from haiqu/Development 
Spanish translation for i18n
 2016-10-28 22:02:13 +02:00
Rob Judd
0d06b679b0 Merge branch 'Development' of https://github.com/bitsquare/bitsquare into Development 2016-10-29 03:47:10 +10:00
Rob Judd
2cf4dd0da8 Take out double backslashes added by stupid editor 2016-10-29 03:46:07 +10:00
Rob Judd
58b81327b9 Take out merge crap 2016-10-29 03:43:55 +10:00
Rob Judd
c97b85e2af Re-commit after merge 2016-10-29 03:39:27 +10:00
Manfred Karrer
0661206230 Merge remote-tracking branch 'origin/Development' into Development 2016-10-28 18:26:39 +02:00
Manfred Karrer
9440ecdf7d Merge branch 'master' into Development 2016-10-28 18:26:32 +02:00
Manfred Karrer
b6948f9523 Add install comments 2016-10-28 18:26:13 +02:00
Manfred Karrer
e793c11368 Merge pull request #681 from haiqu/iss678 
Iss678 Modified Cash Deposit button
 2016-10-28 18:25:38 +02:00
Rob Judd
0f73fe63c3 Update i18n files already partially done 2016-10-29 01:53:08 +10:00
Rob Judd
8612ac66e5 Update unfinished files to current level 2016-10-29 01:30:28 +10:00
Rob Judd
e025e1d2f8 Minor edit 2016-10-29 01:07:25 +10:00
Rob Judd
6d0c191a99 Fix two more files related to #678 2016-10-28 23:41:51 +10:00
Rob Judd
1e0dffb749 Issue #678 2016-10-28 22:28:26 +10:00
Rob Judd
9a73314c50 Merge pull request #2 from datsiuk/patch-1 
Translation  displayStrings_es.properties
 2016-10-28 19:54:40 +10:00
datsiuk
b4f6c09fe4 Translation displayStrings_es.properties 
I suppose special characters (á, é, í, ó, ú, ñ) are accepted.

Thesaurus:
arbitrator = árbitro 
fee = tasa, comisión
trade = trato, comercio
trader = comerciante
input = entrada, valor introducido
password = clave
 2016-10-28 10:08:54 +02:00
Manfred Karrer
d54f4d0567 Remove setInsertPubKey call (default value is now false in bitcoinJ) 2016-10-27 22:40:52 +02:00
Manfred Karrer
5420ad38ef Update to bitcoinj 0.13.1.6 2016-10-27 22:38:00 +02:00
Rob Judd
3c2a9d9cc7 Merge branch 'Development' of https://github.com/bitsquare/bitsquare into Development 2016-10-26 17:33:47 +10:00
Manfred Karrer
509e4727c3 Merge pull request #675 from jonathancross/deposit-view 
Simplifying DepositView popup message
 2016-10-25 18:28:26 +02:00
Jonathan Cross
b6b7a3736c
Simplifying DepositView popup message 2016-10-25 16:51:21 +02:00
Manfred Karrer
354ef34f2c Remove temp fix for check of appended version nr. to offerID 2016-10-25 13:30:30 +02:00
Manfred Karrer
f51bf75003 Only open ext. wallet on left click (Fix for: https://github.com/bitsquare/bitsquare/issues/630) 2016-10-25 13:11:43 +02:00
Manfred Karrer
49f116dd1c Merge branch 'master' into Development 2016-10-25 03:56:04 +02:00
Manfred Karrer
f9a7d2c837 Set default value for insertPubKey flag to false. Update to BitcoinJ version 0.13.1.6 2016-10-25 03:53:45 +02:00
Manfred Karrer
d781c4d4cc Merge pull request #673 from jonathancross/account-view 
Repurposing Account view popup as intro
 2016-10-25 03:07:59 +02:00