Manfred Karrer
e1f23be46e
Add vote result view
2018-07-19 16:44:35 +02:00
Manfred Karrer
f27a7461c8
Rename classes
2018-07-18 23:19:53 +02:00
Manfred Karrer
288f4a7d89
Update proposal view on height change
2018-07-18 23:16:09 +02:00
Manfred Karrer
7dd28e9156
Fix wrong removal of listener
2018-07-18 22:51:29 +02:00
Manfred Karrer
cf9b51a0d5
Add proposalFee text field
2018-07-18 21:41:56 +02:00
Manfred Karrer
bcc1b88bfc
Fix confirmations list view
2018-07-18 21:14:31 +02:00
Manfred Karrer
547fb2f070
Apply code analysis, cleanups
2018-07-18 21:05:38 +02:00
Manfred Karrer
18163b7991
Rename StateService to BsqStateService
2018-07-18 19:43:41 +02:00
Manfred Karrer
513350ff67
Refactor state listeners
2018-07-18 19:23:24 +02:00
Manfred Karrer
29d95c2bd9
Improve UI
2018-07-17 18:20:52 +02:00
Manfred Karrer
eeb9006452
Fix UI bug with dashboard view
2018-07-17 17:44:35 +02:00
Manfred Karrer
24915aff59
Add check for android
2018-07-16 23:42:23 +02:00
Manfred Karrer
d2e8c0cf09
Add tests
2018-07-16 23:20:12 +02:00
Manfred Karrer
e677c1a007
Don't use recursive parser. UI improvements
...
Don't use recursive parser but raw tx list from bitcoin core.
2018-07-16 18:57:20 +02:00
Manfred Karrer
4c2366b598
Add descriptor
2018-07-16 14:11:36 +02:00
Manfred Karrer
198afcd6b6
Merge pull request #9 from sqrrm/dao
...
Dao
2018-07-16 03:08:03 +02:00
Manfred Karrer
a957145e09
Add testMsg for all types
2018-07-16 00:17:48 +02:00
Manfred Karrer
751567d999
Add price alerts
2018-07-15 23:13:59 +02:00
sqrrm
d0cfd619fe
Remove check for already handled InsufficientMoneyException
2018-07-15 19:29:43 +02:00
sqrrm
09b6202d0d
Remove direct references to stateService in desktop
2018-07-15 19:29:43 +02:00
Manfred Karrer
0832f3a3dc
Improve UI, fix productionMode
2018-07-15 14:01:18 +02:00
Manfred Karrer
9f01e9e4e0
Add voteResult view
2018-07-15 10:52:40 +02:00
Manfred Karrer
dfcda392d5
Handle case if multiple param proposals got voted ok
2018-07-13 22:07:16 +02:00
Manfred Karrer
f307b1e336
Remove unneeded model
2018-07-13 21:09:07 +02:00
Manfred Karrer
b7f131f684
Add TODOs
2018-07-13 20:18:40 +02:00
Manfred Karrer
333133a8f0
Merge pull request #8 from sqrrm/dao
...
Dao
2018-07-13 20:08:49 +02:00
sqrrm
069802bbe5
Rename locked to lockup
...
To avoid confusion and be more specific, 'lockup' should be used when
refering to LOCKUP outputs. This is to keep the more generic usage of
'locked' as referring to funds that can't be spent right now for
whatever reason
2018-07-13 15:57:04 +02:00
sqrrm
5011d4f629
Use daoFacade from outside of core
...
Rename locked to lockup where appropriate
2018-07-13 15:36:13 +02:00
Manfred Karrer
83fac4143d
Merge pull request #7 from sqrrm/dao-cleaning2
...
Remove getValueLockedUpInBond
2018-07-13 04:18:32 +02:00
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
