Commit Graph

5036 Commits

Author SHA1 Message Date
Christoph Atteneder
2324d7c0fb
Remove unused variable 2018-01-31 10:33:05 +01:00
Christoph Atteneder
2d897f2cc4
Extends FundsTextfield behavior for re-usage 2018-01-31 10:13:25 +01:00
Christoph Atteneder
e2b2bcd0d6
Adapt styling 2018-01-31 10:12:41 +01:00
Christoph Atteneder
029a3a4ac9
Change and refactor usage of total funds info popup 2018-01-30 20:13:50 +01:00
Christoph Atteneder
e1e462afb0
Remove unnecessary setting of anchor 2018-01-30 14:45:09 +01:00
Manfred Karrer
ef5bc80783
Merge pull request #1275 from sqrrm/bsq-genesis-option
Bsq genesis option
2018-01-26 22:32:18 -05:00
sqrrm
95ecec6d12
Add command line option to set BSQ genesis tx id 2018-01-25 16:52:36 +01:00
sqrrm
14e5d69998
Minor cleanup and renaming 2018-01-25 16:42:57 +01:00
Manfred Karrer
a0cdffaddc
Deactive dev flags 2018-01-24 20:46:32 -05:00
Manfred Karrer
6895ac9105
Refactoring: Rename methods 2018-01-24 20:43:30 -05:00
Manfred Karrer
f1d60ddcdb
Fix wrong argument at callFunctionWithWriteLock 2018-01-24 20:21:22 -05:00
Manfred Karrer
22d79b0f54
Remove unneeded Type 2018-01-24 20:18:18 -05:00
Manfred Karrer
e9f8644af4
Merge branch 'sqrrm-bsqparser-test' into dao 2018-01-24 20:17:12 -05:00
Manfred Karrer
125143c8f5
Merge branch 'bsqparser-test' of https://github.com/sqrrm/exchange into sqrrm-bsqparser-test 2018-01-24 20:13:59 -05:00
Manfred Karrer
e00ee1c9cc
Fix wrong else branch. Add clear method to HyperlinkWithIcon 2018-01-24 19:58:09 -05:00
Manfred Karrer
34dd0b71d0
Merge branch 'Development' into dao
# Conflicts:
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/active/ActiveCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bisq/gui/main/dao/voting/vote/VoteView.java
#	gui/src/main/java/io/bisq/gui/main/dao/wallet/tx/BsqTxView.java
#	gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java
2018-01-24 19:44:01 -05:00
Manfred Karrer
7467c375f9
Merge branch 'master' into Development 2018-01-24 19:28:42 -05:00
Manfred Karrer
f5f69454da
Merge pull request #1259 from cbeams/remove-provider
Remove provider module after extracting to new repo
2018-01-24 19:25:35 -05:00
Manfred Karrer
e64a3ca712
Merge branch 'ripcurlx-feature/fix-tooltip-issues' into Development 2018-01-24 17:22:00 -05:00
Manfred Karrer
28096d351d
Merge branch 'feature/fix-tooltip-issues' of https://github.com/ripcurlx/exchange into ripcurlx-feature/fix-tooltip-issues 2018-01-24 17:16:38 -05:00
Manfred Karrer
5e75f0139d
Merge branch 'master' into Development 2018-01-24 17:15:58 -05:00
Chris Beams
5c98bb73d0
Merge pull request #1271 from balistof/master
Add path character for litecoin blockcypher web address
2018-01-24 15:53:48 +01:00
Christoph Fröschl
4620fb8b4b Add path character for litecoin blockcypher web address 2018-01-24 15:19:19 +01:00
sqrrm
99d9ea6619
bsqparsertest: add test for isBsqTx
Testing only the most basic cases of inputs.
2018-01-24 13:56:48 +01:00
sqrrm
4dd4c248ed
bsqparser: refactor isBsqTx and make atomic 2018-01-24 13:55:59 +01:00
Chris Beams
c53695ae60
Remove provider module after extracting to new repo
See bisq-network/pricenode#2
2018-01-24 02:53:45 +01:00
Manfred Karrer
8075f9eef9
Fix NullPointer if faultHandler is null at initial request 2018-01-23 18:53:24 -05:00
Christoph Atteneder
fa59686a93
Use radiobutton that displays a tooltip when text is truncated 2018-01-23 16:26:17 +01:00
Christoph Atteneder
db460ae111
Add checkbox that shows a tooltip when text is truncated 2018-01-23 16:13:47 +01:00
sqrrm
e9e4a827ca
bsqblockchain: use write lock for atomic writes
A ReentrantReadWriteLock is used. By acquiring the write lock over the
atomic write all other locks acquired during the atomic operation will
work as expected.
2018-01-23 15:37:22 +01:00
Christoph Atteneder
ef01d06911
Use AutoTooltipLabel also in fxml views 2018-01-23 11:25:03 +01:00
Christoph Atteneder
b84a29cb0e
Add missing bracket 2018-01-23 11:16:02 +01:00
Christoph Atteneder
a52ce155ed
Replace regular text cells with tooltip labels that show a tooltip when truncated 2018-01-23 10:55:28 +01:00
Christoph Atteneder
25c24a5366
Align address columns left 2018-01-23 10:27:09 +01:00
Christoph Atteneder
0d8c074700
Use regular Labels for icons to prevent issues when tooltip is set manually 2018-01-23 09:58:09 +01:00
Chris Beams
31564e923c
Update doc/CONTRIBUTING.md to request PRs on master
This doc should be removed in favor of the root-level CONTRIBUTING.md,
but this can be done later; this is just a quick fix to make sure we've
gotten rid of all references to the `Development` branch.
2018-01-23 09:45:13 +01:00
Chris Beams
5c3a770c8d
Add CONTRIBUTING.md 2018-01-23 09:08:30 +01:00
Manfred Karrer
d341c44471
Merge branch 'master' into Development 2018-01-22 20:29:30 -05:00
Manfred Karrer
9546a95f48
Add colon to label 2018-01-22 20:29:15 -05:00
Manfred Karrer
14b0292460
Merge branch 'Development' into UI-improvements 2018-01-22 19:44:51 -05:00
Manfred Karrer
c7e5563481
Merge branch 'ripcurlx-feature/unify-tooltip-styling' into UI-improvements 2018-01-22 19:43:46 -05:00
Manfred Karrer
1f91160b3b
Merge branch 'feature/unify-tooltip-styling' of https://github.com/ripcurlx/exchange into ripcurlx-feature/unify-tooltip-styling 2018-01-22 19:28:16 -05:00
Chris Beams
c725376e8d
Replace 'that' => 'this' in version update dialog 2018-01-22 08:55:32 +01:00
Manfred Karrer
8b98429341
Only add offers if it is not in list 2018-01-21 12:06:38 -05:00
Manfred Karrer
02f04d3129
Cleanup 2018-01-21 12:06:04 -05:00
Manfred Karrer
c4c4c0662b
Add extra checks to avoid duplicated offers (#1246) 2018-01-21 09:25:31 -05:00
Manfred Karrer
e84cf66f47
Update PersistableNetworkPayloadMap_BTC_MAINNET 2018-01-20 20:51:46 -05:00
Manfred Karrer
33eecd81aa
Release 0.6.4 2018-01-20 20:47:53 -05:00
Manfred Karrer
885e57fb62
Change default tx fee from 100 to 200 sat per byte 2018-01-20 19:52:16 -05:00
Manfred Karrer
ff947cde55
Merge branch 'balistof-Development' into Development 2018-01-20 19:41:29 -05:00