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

430 commits

Author SHA1 Message Date
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
9cb0134369 Add reminder for seed word and backup before setting the wallet pw 2017-07-16 00:53:11 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2 
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
 2017-07-15 14:57:42 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
1d5965e296 Merge remote-tracking branch 'origin/0.5.2' into 0.5.2 2017-07-14 11:43:23 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Mike Rosseel
c1e0e76127 move unit tests, add unit test for sigs, add documentation 2017-07-12 16:32:33 +02:00
Manfred Karrer
afe2a17f71 Merge branch 'downloadUpdates' into 0.5.2 2017-07-12 03:28:56 +02:00
Manfred Karrer
7067acc824 Improve UI for in-app-download window. 2017-07-12 03:28:00 +02:00
Manfred Karrer
dfc67b3df0 Merge branch 'Development' into downloadUpdates 2017-07-11 23:32:36 +02:00
Manfred Karrer
bba9b5179c Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-() 2017-07-11 23:11:07 +02:00
Manfred Karrer
7860116a27 Add UNDEFINED to TxType as default value 2017-07-11 23:02:49 +02:00
Manfred Karrer
dcf4dcd9a4 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:29:47 +02:00
Manfred Karrer
7fde9a17b4 Merge branch 'master' into Development 2017-07-10 23:41:54 +02:00
cedric.walter
e62f7435a8 last fix for mac 2017-07-10 21:52:00 +02:00
cedric.walter
2d91e4118e fixed for macos, avoid having unix profile active on macos 2017-07-10 21:37:39 +02:00
cedric.walter
06c90b46c4 tigthened permissions 2017-07-10 20:17:39 +02:00
cedric.walter
59edcefdc4 used ant-exec to fix permissions instead of maven assembly 2017-07-10 19:58:50 +02:00
Manfred Karrer
4ebcb79a21 Remove dev flags 2017-07-10 12:44:10 +02:00
Manfred Karrer
f27f892cd9 Merge branch 'master' into DAO_phase1 2017-07-09 23:10:23 +02:00
Manfred Karrer
77f8bdb7b0 Merge branch 'master' into DAO_phase1 2017-07-09 23:07:04 +02:00
cedric.walter
fd8a09f28e fixed permissions of protobuf.exe to r-x------ 2017-07-09 20:45:37 +02:00
Manfred Karrer
b70a5a51e8 Merge pull request #858 from cedricwalter/fix-travis-build 
Installing protobuf automagically
 2017-07-08 21:51:36 +02:00
cedric.walter
cdb545f390 removed the need to install protobuf dependenciy as root before building Bisq, more maven way of doing 2017-07-08 18:36:30 +02:00
Manfred Karrer
7a8e99d7b1 Apply Protobuffer to DAO data 2017-07-08 01:36:35 +02:00
Mike Rosseel
95fb2dcebf download update is code complete 2017-07-07 17:37:47 +02:00
Mike Rosseel
1b01ea7cfd rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD 
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
 2017-07-07 17:35:33 +02:00
SimonTuberlin
85cbd39a33 Sig verification for multiple keys 
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
 2017-07-07 17:35:33 +02:00
SimonTuberlin
5ac1ba2e88 Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux) 2017-07-07 17:35:33 +02:00
SimonTuberlin
fb5869602e Ready for first message/download test 2017-07-07 17:35:33 +02:00
SimonTuberlin
fac57c74f7 Prepared DownloadUtil task and updateAlert window 2017-07-07 17:35:33 +02:00
Mike Rosseel
2f4ef841bf rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD 
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
 2017-07-07 17:35:17 +02:00
SimonTuberlin
3e895f45e4 Sig verification for multiple keys 
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
 2017-07-07 17:35:17 +02:00
SimonTuberlin
5a8235008a Download to tmpdir works, can be cancelled by closing update alert, and shows directory upon completion (only tested on Linux) 2017-07-07 17:35:17 +02:00
SimonTuberlin
204e4c4409 Ready for first message/download test 2017-07-07 17:35:17 +02:00
SimonTuberlin
fc01f797f0 Prepared DownloadUtil task and updateAlert window 2017-07-07 17:35:16 +02:00
Manfred Karrer
10fe5493eb Add getBlocks handler 2017-07-06 21:57:24 +02:00
Manfred Karrer
babca8aa1d Add french translation (wip) 2017-07-06 17:23:13 +02:00
Manfred Karrer
43d7b91c5b Remove duplicate shared.currency=Currency: 2017-07-06 17:22:49 +02:00
Manfred Karrer
e75bc9023e Dev setup 2017-07-05 23:40:35 +02:00
Manfred Karrer
a4db1747a6 Replace \\" with \" 2017-07-05 19:29:24 +02:00
Manfred Karrer
e68f4219c6 v0.5.2 2017-07-03 12:18:14 +02:00
Manfred Karrer
aa4b15c007 Fix Locale issue with non-english default locales 2017-07-03 02:24:27 +02:00
Manfred Karrer
a11d39ce62 Rename localeProperty 2017-07-02 22:37:27 +02:00
Manfred Karrer
602c67a1c2 Fix wrong version change 2017-07-01 00:40:54 +02:00