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

8517 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
f5ab159cb5
Remove useless stopAndRemoveTimer call 2019-03-15 22:14:03 -05:00
Manfred Karrer
d57852df34
Merge pull request #2536 from oscarguindzberg/txbroadcaster-fix 
TxBroadcaster improvements
 2019-03-13 18:02:31 -05:00
Oscar Guindzberg
48f159d694 TxBroadcaster improvements 2019-03-13 19:37:56 -03:00
Manfred Karrer
76543bb039
Merge pull request #2528 from ben-kaufman/get-only-accepted-proposals 
Fix bug UI treats rejected proposals as accepted
 2019-03-12 15:05:57 -05:00
Manfred Karrer
da20c4d5c6
Merge pull request #2530 from oscarguindzberg/labelchange 
Stress on the label that Bisq will be shutdown after restore
 2019-03-11 20:15:39 -05:00
Manfred Karrer
05e55be103
Merge pull request #2531 from oscarguindzberg/typo 
Fix typo
 2019-03-11 20:15:12 -05:00
Oscar Guindzberg
f42a5c2936 Fix typo 2019-03-11 16:41:30 -03:00
Oscar Guindzberg
16f01332ac Stress on the label that Bisq will be shutdown after restore 2019-03-11 16:37:25 -03:00
Manfred Karrer
cdce61c128
Merge pull request #2521 from ben-kaufman/dao-feedback-popup 
Added  feedback popup for DAO test users
 2019-03-11 10:44:33 -05:00
Manfred Karrer
c00cf99f22
Merge pull request #2524 from ManfredKarrer/improve-restore-wallet-from-seed-process 
Improve restore wallet from seed process
 2019-03-11 09:13:53 -05:00
Manfred Karrer
98da2c7793
Merge pull request #2523 from ManfredKarrer/fix-index-out-of-bound-issues 
Fix index out of bound issues
 2019-03-11 09:12:53 -05:00
Ben Kaufman
fee8d9ff54 Get only accepted bonded role proposals 
Fix rejected bonded role proposal showing as accepted
 2019-03-11 14:34:22 +02:00
Ben Kaufman
d07493efbc Get only accepted remove asset proposals 
Fix rejected remove asset proposals showing as accepted
 2019-03-11 14:22:53 +02:00
Ben Kaufman
ea4466c479 Use services instead of wallet and fix text 2019-03-11 08:13:44 +02:00
Ben Kaufman
a5a068a246 Fix popup wording 2019-03-11 06:45:03 +02:00
Manfred Karrer
d3349864ae
Automatically restart after restore 2019-03-10 23:40:25 -05:00
Manfred Karrer
82ed732bdd
Replace addTransactionConfidenceEventListener 
Use addCoinsReceivedEventListener and addCoinsSentEventListener instead
of addTransactionConfidenceEventListener as
addTransactionConfidenceEventListener has much more overhead.
I could not reproduce anymore the balance issues I had when I used that
approach during development earlier.
 2019-03-10 23:26:26 -05:00
Manfred Karrer
9ed109330a
Fix index out of bound issues 
At Capabilities I got an exception after going back from a new dev
branch to master and getting p2p network data from nodes still running
on the dev branch as that newly added capability was outside of the
existing scope.

I found another potential issue with DaoPhase.Phase and added a check
there as well.
 2019-03-10 22:40:26 -05:00
Ben Kaufman
f7f91da927 Added feedback popup for DAO test users 2019-03-10 15:43:49 +02:00
Manfred Karrer
257550ac81
Merge pull request #2515 from ManfredKarrer/make-vote-result-json-determinisitic 
Make vote result json deterministic
 2019-03-08 13:06:23 -05:00
Manfred Karrer
07c0d6a4ff
Update seed node operator 2019-03-08 13:01:23 -05:00
Manfred Karrer
ee0fef4d2f
Remove duplicate entry for number of proposals 2019-03-08 12:20:06 -05:00
Manfred Karrer
ca01376ffc
Merge pull request #2517 from ManfredKarrer/fix-missing-balance-at-restore-from-seed-words 
Fix missing balance at restore from seed words
 2019-03-08 12:08:49 -05:00
Christoph Atteneder
ced71361b4
Merge pull request #2519 from ben-kaufman/txid-proposal-display 
Add txId to proposal display
 2019-03-08 17:51:23 +01:00
Ben Kaufman
864fc55c25 Use correct method to open bisq explorer 2019-03-08 18:20:28 +02:00
Manfred Karrer
03023d6338
Remove myAddress from docs and scripts as it is not used/needed anymore 2019-03-08 10:58:53 -05:00
Ben Kaufman
a5af75961c Add txId to proposal display 2019-03-08 12:03:00 +02:00
Manfred Karrer
28a28983dc
Add missing address entry items at restore from seed words 2019-03-07 23:41:21 -05:00
Manfred Karrer
9152733bb1
Set wallet date 1 day earlier to cover timezone issues 
We subtract 1 day to be sure to not have any issues with timezones.
Even if we can be sure that the timezone
is handled correctly it could be that the user created the wallet in
one timezone and make a restore at
a different timezone which could lead in the worst case that he miss
the first day of the wallet transactions.
 2019-03-07 21:46:25 -05:00
Manfred Karrer
855ca062c6
Add missing @EqualsAndHashCode to Capabilities 
Peer extends Capabilities and we use a HashSet to manage persisted
peers. Without the @EqualsAndHashCode we would add endlessly peers to
the hashsets.
 2019-03-07 20:41:40 -05:00
Manfred Karrer
01f3bdc557
Make vote result json deterministic 2019-03-07 17:53:30 -05:00
Manfred Karrer
9a5695dedc
Fix missing support for localhost seed node addresses 2019-03-07 17:23:05 -05:00
Manfred Karrer
d475c82b9b
Merge branch 'master' of https://github.com/bisq-network/bisq 2019-03-07 16:46:41 -05:00
Manfred Karrer
1a29dbec19
Merge pull request #2476 from freimair/seedNodeRepo_refactoring 
Seed node repo refactoring
 2019-03-07 16:46:30 -05:00
Manfred Karrer
1292f77daa
Merge branch 'master' of https://github.com/bisq-network/bisq 2019-03-07 16:36:54 -05:00
Manfred Karrer
6481a53f5c
Merge pull request #2512 from ripcurlx/fix-problem-with-display-of-zero-trading-fees 
Show the correct BSQ or BTC trading fee if it is maker or taker
 2019-03-07 15:53:28 -05:00
Christoph Atteneder
85274b1e52
Show the correct BSQ or BTC trading fee if it is maker or taker 2019-03-07 18:43:27 +01:00
Manfred Karrer
a7b4a566d6
Merge pull request #2511 from ripcurlx/fix-change-of-deposit-before-amount-was-set 
Fix error and improve wording for security deposit
 2019-03-07 12:27:27 -05:00
Christoph Atteneder
0a42b15972
Improve wording for security deposit 2019-03-07 18:15:17 +01:00
Christoph Atteneder
eefa649836
Fix null pointer if security deposit percentage is changed before amount was set 2019-03-07 17:48:52 +01:00
Manfred Karrer
d9f9baf87a
Update comments 2019-03-07 11:29:56 -05:00
Florian Reimair
9418c1d7a3
Fix default regtest seednodes 2019-03-07 17:08:49 +01:00
Florian Reimair
b27befed63
--myAddress property is not needed anymore 2019-03-07 17:08:49 +01:00
Florian Reimair
e15d99e8ae
Use resourceAsStream so it works on files in .jar as well 2019-03-07 17:08:49 +01:00
Florian Reimair
de93a6fa1b
Revert "Revert 2473067b090603dec983fa18995453bdd6d8de94" 
This reverts commit a9ee15d9f6.
 2019-03-07 17:08:49 +01:00
Manfred Karrer
80fa5c029f
Merge pull request #2507 from freimair/monitor 
Monitor tweaks, fixes and a new Metric
 2019-03-07 10:46:41 -05:00
Manfred Karrer
dca9eff047
Merge pull request #2508 from freimair/netlayer_update 
Netlayer 0.6.4
 2019-03-07 10:44:40 -05:00
Christoph Atteneder
bb2ecc9a40
Merge pull request #2505 from ManfredKarrer/add-deprecated-payment-methods-again 
Add removed deprecated payment methods again as it would break trade history
 2019-03-07 15:09:24 +01:00
Florian Reimair
1ff7f008cd
Introduced netlayer 0.6.4 2019-03-07 13:29:12 +01:00
Florian Reimair
35914b8682
Fix sign error in Seed node snapshot diffs 2019-03-07 12:53:16 +01:00