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

4168 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Rosseel
e851db1f01 merge 2017-06-29 15:08:33 +02:00
Mike Rosseel
1dd3245347 Revert "bisq -> Bisq" 
This reverts commit fc863b8278.
 2017-06-29 14:07:19 +02:00
Mike Rosseel
fc863b8278 bisq -> Bisq 2017-06-29 11:42:59 +02:00
Manfred Karrer
11c5c92879 Merge branch 'master' into Development 
# Conflicts:
#	.idea/codeStyleSettings.xml
 2017-06-28 14:48:47 +02:00
Manfred Karrer
0456c43012 Copied over from Development branch (git merge failed) for v.5.0 2017-06-28 14:47:06 +02:00
Manfred Karrer
3fd747efad Version 0.5.0 2017-06-28 14:11:49 +02:00
Manfred Karrer
7441f346a2 Fix issue with InsufficientMoneyException 2017-06-28 13:14:09 +02:00
Manfred Karrer
d6e3bdd100 Fix issue with InsufficientMoneyException 2017-06-28 12:45:23 +02:00
Manfred Karrer
ea7744cf3f Fix null pointer at failed startup 2017-06-28 11:55:29 +02:00
Manfred Karrer
d128b9dd6f Fix script 2017-06-28 10:47:10 +02:00
Manfred Karrer
e1dc9b3017 Update and optimize PersistedEntryMap 2017-06-28 10:35:55 +02:00
Manfred Karrer
e5940ab142 Fix icon path for windoze 2017-06-28 01:54:34 +02:00
Manfred Karrer
863528389d Fix icon path for windoze 2017-06-28 01:51:34 +02:00
Manfred Karrer
165bae7c12 Add Greek and Portuguese, update german, spanish and serbian 2017-06-28 01:49:45 +02:00
Manfred Karrer
d327acfa6d Fix paths, icon name 2017-06-28 01:14:04 +02:00
Manfred Karrer
8718387c60 Remove policy file 2017-06-28 01:08:43 +02:00
Manfred Karrer
59f1ca76e5 Rename file 2017-06-28 01:03:23 +02:00
Manfred Karrer
aab806db28 Rename file 2017-06-28 01:03:09 +02:00
Manfred Karrer
db5ce38c3c Use lower case for files 2017-06-28 01:00:49 +02:00
Manfred Karrer
b32e00ad70 Merge remote-tracking branch 'origin/Development' into Development2 2017-06-28 00:55:10 +02:00
Manfred Karrer
4c46293373 Fix git ignore (bat was ignored!) 2017-06-28 00:54:58 +02:00
Manfred Karrer
0e731f0ebf Merge pull request #843 from riclas/Development 
add new translations
 2017-06-28 00:46:52 +02:00
Manfred Karrer
4fafe3ce04 Git issues WIP 2017-06-28 00:42:26 +02:00
Manfred Karrer
61c65264c7 Git issues WIP 2017-06-28 00:42:01 +02:00
Manfred Karrer
43e05d271e Rename dir 2017-06-28 00:38:08 +02:00
Manfred Karrer
2b665b64fb Add icons 2017-06-28 00:36:58 +02:00
Manfred Karrer
cf46aa2b13 rename dir 2017-06-28 00:36:12 +02:00
Manfred Karrer
373ba4ed40 Use uppercase for Bisq 2017-06-28 00:33:27 +02:00
Manfred Karrer
06724da4bd Update build files 2017-06-28 00:22:23 +02:00
Ricardo Filipe
09e2d04e0d add new translations 2017-06-27 23:15:09 +01:00
Manfred Karrer
68745ead08 Update icon for linux 2017-06-27 23:39:15 +02:00
Manfred Karrer
bb4181dd33 Update build script 2017-06-27 22:53:50 +02:00
Manfred Karrer
1da606dd1b Update build script 2017-06-27 22:48:56 +02:00
Manfred Karrer
9c7386eb8b Update tac 2017-06-27 22:17:21 +02:00
Manfred Karrer
8197be2c8a Cleanup TODOs 2017-06-27 21:47:03 +02:00
Manfred Karrer
955a8b12ef Fix validation of BTC, LTC, DOGE 2017-06-27 21:46:51 +02:00
Manfred Karrer
285c7e94fe Fix email fields 2017-06-27 21:12:35 +02:00
Manfred Karrer
e11b314bbb Add email to bank accounts. Add warning and info for bank accounts regarding chargeback risk and id verification. Add warning to CXC accounts. 2017-06-27 21:05:47 +02:00
Manfred Karrer
d4269adda7 Update tac 2017-06-27 13:07:41 +02:00
Manfred Karrer
0c99aacaa2 Update app icons 2017-06-27 10:53:47 +02:00
Manfred Karrer
ae7aca48d2 Update app icons and build scripts 2017-06-27 02:50:47 +02:00
Manfred Karrer
e1e8c4a428 Update app icons and build scripts 2017-06-27 02:50:31 +02:00
Manfred Karrer
e258b17e7a Update license with Bisq instead of bisq 2017-06-27 01:39:11 +02:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
46d8e6bc05 Use new BTD DAO genesis tx. Use BTC as default currency. Use BTC as base currency for DAO. Deactivate dev key for arbitrator 2017-06-27 00:07:34 +02:00
Manfred Karrer
211145b0d4 Ignore BTC price for venezuelan currency as the official exchange rate is based on wishful thinking only 2017-06-26 22:36:10 +02:00
Manfred Karrer
724615b4ad Fix navigation issue. adjust logging. 2017-06-26 20:12:15 +02:00
Manfred Karrer
61b9766052 Use BTC as base currency for BSQ. 
Update PersistedEntryMap (trade statistics)
Remvoe amountTextField from BSQ receive view.
Disable other menu iems in DAO view, show disabled tabs of phase 2.
Fix nullpointer with setTradeCurrencyFromPaymentAccount in CreateOfferDataModel.
 2017-06-26 19:24:36 +02:00
Manfred Karrer
728dead33c Add timeout and resend support for p2p messages in trade process 2017-06-26 16:09:59 +02:00