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

2867 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonathan Cross
708bc5cf9b
Repurposing Account view popup as intro 2016-10-25 02:42:15 +02:00
Manfred Karrer
8910a9869c Use IBAN/BIC for Sepa instead of Account no/Bank ID 2016-10-24 22:06:22 +02:00
Manfred Karrer
5ba09eabd4 Merge pull request #670 from haiqu/iss666 
Improvements in Create New Accounts
 2016-10-24 22:03:05 +02:00
Rob Judd
358856c846 Delete MakeSound from Dev branch 2016-10-24 15:39:40 +10:00
Rob Judd
0543a51560 Remove from iss666 branch 2016-10-24 15:13:16 +10:00
Rob Judd
fd62d40060 Verbosity 2016-10-24 14:59:18 +10:00
Rob Judd
c258448f25 Verbosity 2016-10-24 14:57:52 +10:00
Rob Judd
b73c264a3d Consistency of forms 2016-10-24 14:56:00 +10:00
Rob Judd
cb37b4a421 Capitalization fix 2016-10-24 14:20:48 +10:00
Rob Judd
dc6ae53443 Fix disappearing text 2016-10-24 14:12:21 +10:00
Rob Judd
1cc9ba75ce Remove system exits 2016-10-24 11:20:13 +10:00
Rob Judd
dc784cf029 Add copyright notice 2016-10-23 19:28:14 +10:00
Rob Judd
f422cb6365 Fixed package location 2016-10-23 19:06:16 +10:00
Rob Judd
56df946f8d Add sound generator 2016-10-23 17:33:11 +10:00
Rob Judd
1a7a867e17 Ignore XChange subdirectory 2016-10-23 15:58:55 +10:00
Manfred Karrer
92e6ec73d8 Merge pull request #667 from haiqu/Development 
Save i18n progress
 2016-10-22 17:20:20 +02:00
Rob Judd
889c91e585 Save i18n progress 2016-10-22 21:22:27 +10:00
Manfred Karrer
00319c8718 Remove Vcash 2016-10-22 01:50:33 +02:00
Manfred Karrer
2ff151fa0c Merge pull request #665 from haiqu/Development 
Improve wording, general cleanup
 2016-10-21 23:15:28 +02:00
Rob Judd
790c8eec5a Fix truncated text 2016-10-22 01:20:40 +10:00
Rob Judd
6d303c3673 Improve wording, general cleanup 2016-10-22 00:33:46 +10:00
Manfred Karrer
e3bd595048 Merge branch 'master' into Development 2016-10-20 13:03:22 +02:00
Manfred Karrer
c8c1eaff7d Merge pull request #658 from haiqu/Development 
Fix documentation Java version 112 iss #657
 2016-10-20 13:02:21 +02:00
Rob Judd
402208f48b Fix documentation Java version 112 iss #657 2016-10-20 19:15:44 +10:00
Manfred Karrer
2f5c1a926a Check if supported crypto key length is > 128 (security policy adopted in Oracel JDK) 2016-10-20 01:45:19 +02:00