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

5992 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
f4beb7e911
Use generics for FormBuilder.Combobox 2018-07-25 14:48:55 +02:00
Manfred Karrer
5c4f06c163
Merge pull request #1607 from ManfredKarrer/f2f 
Implements Face to Face payment method
 2018-07-23 11:11:04 +02:00
Christoph Atteneder
62ffe4c0d6
Continue to show prompt text until text is entered also in TextArea 2018-07-23 10:13:22 +02:00
Manfred Karrer
792371e126
Complete F2F payment method 2018-07-21 01:01:09 +02:00
Manfred Karrer
46342663ab
Add F2F payment method 2018-07-20 22:48:25 +02:00
Bisq GitHub Admin Two
e0cbd7c629
Merge pull request #1601 from ManfredKarrer/sync-with-voting 
Sync up with changes from voting branch
 2018-07-11 02:20:29 +02:00
Bisq GitHub Admin Two
54f5062363
Merge pull request #1605 from ripcurlx/fix-error-message-link 
Reflect new repository structure in issue links
 2018-07-11 02:17:50 +02:00
Christoph Atteneder
eef0c74487
Reflect new repository structure 2018-07-10 13:13:38 +02:00
Manfred Karrer
20414bcc24
Sync up with changes vrom voting branch 
- Add onUiReadyHandler to BisqApp and MainView
- Add startApplication and onApplicationStarted to BisqAppMain
- Improve MenuItem component
- Use TxBroadcaster.Callback() instead of FutureCallback<Transaction>()
- Apply startup changes to MainViewModel
- Apply changes of data storage
 2018-07-08 13:42:38 +02:00
Christoph Atteneder
2b85d84bde
Revert version to -SNAPSHOT 2018-07-04 13:46:35 +02:00
Christoph Atteneder
e465428b4b
Use version 0.7.1 instead of -SNAPSHOT and bump version number where required 2018-07-04 13:44:44 +02:00
Christoph Atteneder
12fcce02de
Use personal bundle identifier 2018-07-04 13:42:41 +02:00
Christoph Atteneder
3e124c561b
Not copy unnecessary BC jar files 2018-07-04 13:42:05 +02:00
Christoph Atteneder
66a7a19aa9
Use version variable 2018-07-04 13:41:05 +02:00
Christoph Atteneder
0ada18fa4e
Use key for Christoph Atteneder 2018-07-04 13:39:30 +02:00
Christoph Atteneder
8732a803ea
Use personal bundle identifier 2018-07-04 13:38:56 +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
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