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

6512 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
4136ed786f
Remove http-api 2018-06-28 20:06:30 +02:00
Manfred Karrer
3eb187acff
Remove http-api 2018-06-28 19:59:57 +02:00
sqrrm
8e5983793c
Rename package Lock to lockup 2018-06-28 16:34:18 +02:00
sqrrm
90297201f2
Add bonding dashboard 2018-06-28 14:49:57 +02:00
Manfred Karrer
60e58f7bcb
Renaming, cleanup, small fixes 2018-06-28 12:42:14 +02:00
Manfred Karrer
c9b65fcc19
Merge pull request #3 from sqrrm/bonding 
Bonding
 2018-06-28 09:33:32 +02:00
Manfred Karrer
802ec48104
Merge pull request #1595 from ripcurlx/fix-and-refactor-edit-offer-with-multiple-currency-payment-accounts 
Fix edit offer problem for payment accounts with multiple currencies
 2018-06-27 22:14:04 +02:00
Christoph Atteneder
a64404ef5a
Use equals 2018-06-27 22:07:11 +02:00
Manfred Karrer
2aad28d23c
Cleanup, small fixes 2018-06-27 21:45:44 +02:00
Manfred Karrer
2d5688a9a3
Fix nullpointer 
Log used message (not set string here) instead of
PrivateNotificationPayload message.
 2018-06-27 21:45:15 +02:00
Christoph Atteneder
b00cbe846f
Rename classes to prevent confusion and add fix for payment accounts with multiple currencies when editing offers 2018-06-27 19:29:50 +02:00
Manfred Karrer
aecbb71620
Merge pull request #1591 from ManfredKarrer/fix-trades-sorting-bug 
Fix sorting of currencies in market/trades view
 2018-06-27 12:32:36 +02:00
Manfred Karrer
98335e88e1
Merge pull request #1593 from ripcurlx/fix-tests 
Fixes broken test maker
 2018-06-27 12:20:48 +02:00
Christoph Atteneder
ee6e20eeb4
Fix broken maker 2018-06-27 12:18:53 +02:00
Manfred Karrer
87b73592e8
Merge pull request #1592 from ManfredKarrer/misc-fixes 
Misc fixes and cleanups
 2018-06-27 12:06:51 +02:00
Christoph Atteneder
34660d4ef7
Fix OfferBookVIewModel constructor parameters in test 2018-06-27 11:44:34 +02:00
Manfred Karrer
0e15f3c537
Misc fixes and cleanups 
- Fix bug with ignored taker check (use peer instead of
offer.getMakerNodeAddress()).
- Remove redundant tradeStatisticsSet in TradeStatisticsManager
- Remove handling for old TradeStatistics objects (since v 0.6.0 not
supported anymore)
- Use marketPricePresentation.priceFeedComboBoxItems instead of
- MainVievModel.priceFeedComboBoxItems.
- Replace Authorisation # with Authorisation number.
- Remove https://bisq.network/survey and https://bisq.community links
in tradeFeedbackWindow text.
- Add null checks.
- Improve logging.
- Cleanup
 2018-06-27 11:14:32 +02:00
Manfred Karrer
fe14f70b9f
Fix sorting of trades 
Trades are sorted by number of trades (if selected that option in
preferences). The PriorityQueue used for the list do not apply the
sorting of the list (only sorts when taking an element out). We use a
ArrayList instead to apply sorting.
 2018-06-27 08:59:04 +02:00
Manfred Karrer
c8cfc89c13
Add prompt text for refererId field 2018-06-27 07:44:08 +02:00
Manfred Karrer
a0a26f25ed
Renaming 
- textFieldWithIconWithIcon to textFieldWithIcon
 2018-06-27 07:40:34 +02:00
Manfred Karrer
53440e1ec5
Fix merge issues 
- Add missing exception
- Add missing parameters
- Cleanup
 2018-06-27 07:36:53 +02:00
Manfred Karrer
5f0f921b4c
Merge pull request #1590 from ManfredKarrer/referer 
Add support for referrer IDs at offers and trades
 2018-06-27 07:21:49 +02:00
Manfred Karrer
0afc29fb0e
Merge pull request #1588 from ManfredKarrer/popup-at-trade-completed 
Add popup for feedback after trade completion
 2018-06-27 07:20:02 +02:00
Manfred Karrer
2e6971a597
Merge pull request #1589 from ManfredKarrer/refactoring-mainviewmodel 
Refactoring mainviewmodel
 2018-06-27 07:12:56 +02:00
Manfred Karrer
08a5160501
Merge branch 'master' into popup-at-trade-completed 2018-06-26 21:57:04 +02:00
Manfred Karrer
9e6e0c6de6
Add support for referrer IDs at offers and trades 
See: https://github.com/bisq-network/proposals/issues/28
 2018-06-26 21:52:49 +02:00
Manfred Karrer
808915ec82
Add support for referrer IDs at offers and trades 
See: https://github.com/bisq-network/proposals/issues/28
 2018-06-26 21:35:30 +02:00
Manfred Karrer
1d8a6fe24e
Merge branch 'master' into refactoring-mainviewmodel 2018-06-26 15:20:20 +02:00
Manfred Karrer
28a5d82fd0
Merge pull request #1522 from blabno/feature/money-gram-payment-method 
Add payment method: moneygram
 2018-06-26 15:18:01 +02:00
Manfred Karrer
80db056ca8
Merge pull request #1586 from ManfredKarrer/confirmation-message 
Ack messages for all trade, offer- and dispute messages
 2018-06-26 14:13:48 +02:00
Manfred Karrer
5d34cd9601
Use https://bisq.network/survey as link 2018-06-26 13:43:22 +02:00
Manfred Karrer
e8072a2360
Add popup for feedback after trade completion 
See: https://github.com/bisq-network/bisq-desktop/issues/1584
 2018-06-26 13:25:17 +02:00
Bernard Labno
edd421654a
Add payment method: moneygram 2018-06-26 12:38:49 +02:00
Manfred Karrer
26ad3cddf6
Merge branch 'master' into refactoring-mainviewmodel 
# Conflicts:
#	src/main/java/bisq/desktop/main/MainViewModel.java
 2018-06-26 10:57:28 +02:00
Manfred Karrer
0b283767fa
Add @Nullable annotation 2018-06-26 00:44:03 +02:00
Manfred Karrer
243110710f
Add link to https://github.com/ManfredKarrer/tools 2018-06-26 00:34:37 +02:00
Manfred Karrer
0c206d7a1a
Add icon to trade message status field 2018-06-25 23:45:20 +02:00
Manfred Karrer
b6094112f0
Merge branch 'master' into confirmation-message 2018-06-25 18:20:59 +02:00
Manfred Karrer
97677e515e
Improve logging 2018-06-25 18:08:46 +02:00
sqrrm
ce36a91f64
Don't show unlocked bonds in unlockview 2018-06-25 17:36:23 +02:00
sqrrm
6475aaa36b
Display locked amount 2018-06-25 16:54:47 +02:00
Manfred Karrer
1d4ac86e0e
Merge pull request #1583 from ripcurlx/fix-currency-issues-after-editing-offer 
Set default payment account for an edited offer to null
 2018-06-25 14:54:30 +02:00
sqrrm
a637d94c4b
Fix rebase issues 2018-06-25 14:10:39 +02:00
sqrrm
d5d7ea8e7e
Add unlock functionality 2018-06-25 13:53:33 +02:00
sqrrm
3ac0d225ef
Add actual lockup functionality 2018-06-25 13:53:33 +02:00
sqrrm
56f4caf7bc
Add basic UI for bond lockup 2018-06-25 13:53:33 +02:00
Christoph Atteneder
a16f6a8e53
Add nullable annotation 2018-06-25 12:09:40 +02:00
Christoph Atteneder
a323e2d9b9
Set default payment account for an edited offer to null 2018-06-25 11:56:00 +02:00
Manfred Karrer
e1c4a1fc76
Add support for AckMessage at offer availability protocol 2018-06-25 10:42:11 +02:00
Manfred Karrer
475875d7cc
Improve dispute AckMsg handling 
- Show errors at send dispute msg and at ackMsg.

- Add supportedCapabilities of persisted or reported peers to a peer
from a new connection (which has empty supportedCapabilities).
 2018-06-24 16:09:24 +02:00