Manfred Karrer
5dec138b4f
Add JavaFXWebcam window
2018-07-13 04:09:40 +02:00
sqrrm
d4a0287292
Remove getValueLockedUpInBond
2018-07-13 00:45:06 +02:00
Manfred Karrer
4e5126c02b
Show bond info, cleanups, handle non-BSQ funds
2018-07-13 00:15:18 +02:00
Manfred Karrer
cb6de8cad0
Use scroll pane in all DAO views
2018-07-12 10:08:04 +02:00
Manfred Karrer
84173fd106
Add display of non-BSQ satoshi
2018-07-12 09:44:25 +02:00
Manfred Karrer
2d264b0db2
Add BSQ emergency wallet tool and show BTC balance
2018-07-12 09:27:26 +02:00
Manfred Karrer
e394828967
Merge pull request #6 from sqrrm/dao-cleanup
...
Cleanup some bonding stuff
2018-07-11 16:12:37 +02:00
sqrrm
41ad793454
Exclude spending of locked BSQ in pending balance
2018-07-11 15:10:02 +02:00
Manfred Karrer
fa208157cc
Fix threading issue
2018-07-11 13:34:53 +02:00
Manfred Karrer
9ee9b936cf
Merge branch 'master' into notifications
2018-07-11 13:23:04 +02:00
Manfred Karrer
4ec69f082e
Merge branch 'master' into voting
...
# Conflicts:
# build.gradle
# src/main/java/bisq/core/CoreModule.java
# src/main/java/bisq/core/dao/DaoModule.java
# src/main/java/bisq/core/dao/DaoSetup.java
# src/main/java/bisq/core/dao/vote/blindvote/BlindVoteService.java
# src/main/java/bisq/core/dao/vote/proposal/ProposalService.java
# src/main/java/bisq/core/dao/vote/votereveal/VoteRevealService.java
# src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
# src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java
# src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
# src/main/resources/i18n/displayStrings_de.properties
# src/main/resources/i18n/displayStrings_el.properties
# src/main/resources/i18n/displayStrings_es.properties
# src/main/resources/i18n/displayStrings_hu.properties
# src/main/resources/i18n/displayStrings_pt.properties
# src/main/resources/i18n/displayStrings_ro.properties
# src/main/resources/i18n/displayStrings_ru.properties
# src/main/resources/i18n/displayStrings_sr.properties
# src/main/resources/i18n/displayStrings_zh.properties
Merge branch 'master' into voting
# Conflicts:
# src/main/java/bisq/common/UserThread.java
# src/main/proto/pb.proto
Merge branch 'master' into voting
# Conflicts:
# src/main/java/bisq/desktop/app/BisqAppMain.java
# src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
2018-07-11 02:43:32 +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
Manfred Karrer
b86c03ecc6
Add notifications for offers, trades and disputes
2018-07-11 01:46:28 +02:00
Manfred Karrer
253eb4ca4d
Remove WebCamAppLauncher
2018-07-11 00:20:20 +02:00
Manfred Karrer
a0b05c0741
Add mobile notification view
2018-07-11 00:08:42 +02:00
Christoph Atteneder
eef0c74487
Reflect new repository structure
2018-07-10 13:13:38 +02:00
Manfred Karrer
e0ed19cf1c
Move Param class
2018-07-10 01:46:35 +02:00
Manfred Karrer
70d37d31ae
Change param map in state
2018-07-10 01:23:39 +02:00
Manfred Karrer
0f1a23a651
Rename
2018-07-09 22:15:57 +02:00
Manfred Karrer
052c46fe06
Add param request
2018-07-09 22:13:52 +02:00
Manfred Karrer
387078b157
Improve logs, cleanup
2018-07-08 21:04:23 +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
Manfred Karrer
bdb40cd514
Fix wrong equals check at litenode. Cleanups
2018-07-07 22:00:00 +02:00
Manfred Karrer
a7ddd27725
Set TxOutputType at TxOutputProcessor
2018-07-07 21:01:27 +02:00
Manfred Karrer
0d39aad91f
Apply fixes to stateService
2018-07-07 18:57:02 +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
d9ce3cf55e
Refactor mutable data handling in State
...
The data handling with flat maps for each type of mutable data as we
used before feels very un-intuitive to use.
This commit changes the flat map to a tree structure.
We use a map of mutableTx objects. The mutableTx contains the
immutable Tx and a map of mutableTxOutputs as well as mutable fields
like type. The mutableTxOutput contains an immutable TxOutput and
mutable fields like type.
That commit might have broken something in the bonding. Should be fixed
in updates...
2018-06-29 23:27:03 +02:00
Manfred Karrer
15ad8f8f40
Update gradle files
...
- Move mavenLocal on top to resolve local jars first
- Comment out annotationProcessor and testAnnotationProcessor entries as
they conflict with grpc build (don't know why). Complete project build
works also without the annotationProcessor entries.
- Comment out btcd-cli4j entries in dependencyVerification as they cause
build failure. TODO investigate why...
2018-06-29 11:59:40 +02:00
Manfred Karrer
a78180ecc6
Merged master
2018-06-29 00:14:29 +02:00
Manfred Karrer
2e83a3665d
Merged master
2018-06-29 00:13:48 +02:00
Manfred Karrer
c34643a2cc
Merge pull request #4 from sqrrm/cleanup-bonding
...
Cleanup bonding
2018-06-28 21:52:18 +02:00
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
