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

9776 commits

This branch
This branch
All branches
Author SHA1 Message Date
lukasz
a9c24488fd Refactor BisqApp - update scene size calculation 2019-10-09 17:35:58 +02:00
Christoph Atteneder
7bed73e687
Merge pull request #3344 from wiz/tweak-japan-bank-transfer-string 
Translate name of Japan Bank Transfer for non-Japanese users
 2019-09-30 09:55:58 +02:00
wiz
c63c77ce1e
Tweak the English name of Japan Bank Transfer payment method 2019-09-28 18:00:28 +09:00
Christoph Atteneder
06a28d0686
Merge pull request #3289 from plutomonkey/ergo 
Add Ergo (ERG) without Bouncy Castle dependency.
 2019-09-27 12:48:10 +02:00
Florian Reimair
3303b90e48 periodical UpdateDataReq for Seednodes (#3202) 
* Refactored logging into subroutine

* Only do recurring updatedatareq if seednode

* UpdateDataReq is run periodically

* Only store PeristablePayloads once
 2019-09-26 13:42:26 +02:00
Christoph Atteneder
95304ff98c
Merge pull request #3302 from freimair/monitor 
Monitor fixes
 2019-09-26 13:41:25 +02:00
sqrrm
f2e846e122
Merge pull request #3321 from christophsturm/inject-dao-killswitch 
inject DaoKillSwitch
 2019-09-25 19:01:11 +02:00
sqrrm
8f3cf65343
Merge pull request #3237 from devinbileck/hide-altcoin-account-age-salt 
Hide account age verification salt for altcoin accounts
 2019-09-25 16:45:04 +02:00
Christoph Sturm
939f48a29b remove instance 2019-09-24 18:17:38 +02:00
Christoph Sturm
9cd5c9f83f inject DaoKillSwitch 2019-09-24 16:56:40 +02:00
Christoph Atteneder
490eaab6d9
Merge pull request #3301 from wiz/increase-chart-data 
Increase chart maxTicks from 30 to 90
 2019-09-23 11:20:58 +02:00
Christoph Atteneder
e90856e97d
Merge pull request #3313 from bisq-network/hotfix/v1.1.6 
Hotfix branch (v1.1.7)
 2019-09-23 11:06:31 +02:00
Christoph Atteneder
4201e065bc
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2019-09-23 10:57:03 +02:00
Christoph Atteneder
4842352756
Revert to SNAPSHOT version 2019-09-23 10:55:08 +02:00
Christoph Atteneder
58f3f73d56
Bump version number 2019-09-23 10:10:09 +02:00
Christoph Atteneder
39a811ec26
Fix broken line break 2019-09-23 10:07:53 +02:00
Christoph Atteneder
1375f3d821
Update data directories 2019-09-23 09:43:35 +02:00
chimp1984
8cf49e0308
Add missing handling for mailbox messages 
- Without that fix mediated payouts would only succeed if both users are
online.
 2019-09-23 09:43:13 +02:00
chimp1984
29f1cb29e3
Fix potential ConcurrentModificationException 
We need to delay that call as we might get executed at startup after
mailbox messages are applied where we iterate over out pending trades.
The closeDisputedTrade method would remove that trade from the list
causing a ConcurrentModificationException.
To avoid that we delay for one render frame.
 2019-09-23 09:43:02 +02:00
chimp1984
e22707a67a
Avoid that the mediation result popup is shown 2019-09-23 09:42:52 +02:00
Christoph Atteneder
b7cf661f28
Merge pull request #3312 from ripcurlx/update-data-directories 
Update data directories
 2019-09-23 09:39:27 +02:00
Christoph Atteneder
7f88bbf30b
Update data directories 2019-09-23 09:30:41 +02:00
Christoph Atteneder
51d3179d6b
Merge pull request #3310 from chimp1984/fix-missing-handling-of-mediator-mailbox-msg 
Fix missing handling of mediator mailbox msg
 2019-09-23 09:00:14 +02:00
Christoph Atteneder
fdb0908502
Merge pull request #3309 from chimp1984/Revert-code-format-changes 
Revert recent code format changes
 2019-09-23 08:57:00 +02:00
chimp1984
a1d2999c97
Avoid that the mediation result popup is shown 2019-09-23 01:24:46 +02:00
chimp1984
94724a2365
Fix potential ConcurrentModificationException 
We need to delay that call as we might get executed at startup after
mailbox messages are applied where we iterate over out pending trades.
The closeDisputedTrade method would remove that trade from the list
causing a ConcurrentModificationException.
To avoid that we delay for one render frame.
 2019-09-23 01:06:20 +02:00
chimp1984
8cd9f29b5a
Add missing handling for mailbox messages 
- Without that fix mediated payouts would only succeed if both users are
online.
 2019-09-23 01:05:44 +02:00
chimp1984
d26b451698
Revert recent code format changes 
The recent changes breaks current formatting radically and does not
lead to better results as it was before.
Before applying new changes, please test it with bigger classes to see
if the result is as intended.
 2019-09-23 00:59:16 +02:00
Florian Reimair
c379279241
Add all capabilities so we get all the data 2019-09-20 16:38:18 +02:00
Florian Reimair
b617e74f8b
Load hashes from local store for market stats 2019-09-20 14:57:57 +02:00
Florian Reimair
abe7bc1da0
Bump datstateheight to start from on restart 2019-09-20 14:16:57 +02:00
Florian Reimair
56f67e74e8
Changed rel no. ref. host to overall unique msg 
Relative number of messages have been calculated against one random seed node. Now, these numbers are calculated against the total number of unique messages available on all seed nodes. Lets us judge whether seed nodes are in sync not only quantitatively but also qualitatively.
 2019-09-20 14:16:57 +02:00
Florian Reimair
b357bb8540
Load hashes from local store 2019-09-20 14:16:14 +02:00
wiz
3b2610f79e
Increase chart maxTicks from 30 to 90 2019-09-20 20:01:51 +09:00
Florian Reimair
5fb650ee34
Fixed mandatory capabilities 2019-09-20 12:15:21 +02:00
sqrrm
4274a8e3af
Merge pull request #3300 from wiz/add-wiz-pricenode 
Add new pricenode gztmprecgqjq64zh operated by @wiz
 2019-09-20 12:14:07 +02:00
wiz
593abc24c2
Add new pricenode gztmprecgqjq64zh operated by @wiz 2019-09-20 16:22:16 +09:00
Christoph Atteneder
9c82510e4e
Merge pull request #3296 from christophsturm/chop-down-long 
chop down long chained calls and force brackets on if
 2019-09-19 16:46:50 +02:00
Christoph Atteneder
54f2407227
Merge pull request #3297 from ripcurlx/add-mediator-to-dev-setup 
Add mediator registration to Dev setup
 2019-09-19 16:45:25 +02:00
Christoph Atteneder
fb4673898a
Merge pull request #3298 from ripcurlx/update-release-process 
Remove unnecessary release step
 2019-09-19 16:45:09 +02:00
Christoph Atteneder
2f35227df6
Merge pull request #3299 from ripcurlx/update-copyright-date 
Update copyright date for macOS binary
 2019-09-19 16:36:12 +02:00
Christoph Atteneder
27b6035278
Update copyright date for macOS binary 2019-09-19 16:18:30 +02:00
Christoph Atteneder
42326154d1
Merge pull request #3224 from note-llc/master 
List Noteblockhain [NTBC]
 2019-09-19 16:10:34 +02:00
initCCG
08bbfe8ab4 add Right-to-Left support (#2774) 
* add Right-to-Left support

* make requested changes in PR #2774
 2019-09-19 16:06:21 +02:00
Christoph Atteneder
f0fb663a90
Merge pull request #3194 from ben-kaufman/fix-offer-volume-jumps 
Fix offer volume jumps
 2019-09-19 15:45:51 +02:00
Christoph Atteneder
02fb5a6f77
Remove unnecessary release step because of updates in the bisq-website repository 2019-09-19 15:31:10 +02:00
Christoph Atteneder
d388c7c81a
Revert to SNAPSHOT version 2019-09-19 15:28:49 +02:00
Christoph Sturm
b6b0d6c272 chop down long chained calls and force brackets on if 2019-09-19 14:39:24 +02:00
sqrrm
bd1f19c030
Merge pull request #3287 from battleofwizards/remove-controlsfx 
Remove controlsfx dependency
 2019-09-19 12:25:03 +02:00
sqrrm
bff731f272
Merge pull request #3283 from christophsturm/gradle-sources 
use gradle dist with sources for better IDE experience.
 2019-09-19 11:52:45 +02:00