Commit graph

154 commits

Author SHA1 Message Date
Manfred Karrer
880a8412fc
Merge pull request #1957 from j3ko/release-candidate-0.9.0
Add advanced cash payment method
2018-11-24 12:09:04 +01:00
Jeffrey Ko
dd3abd2996
make advanced cash payment method more consistent ok pay payment method 2018-11-24 13:26:12 +07:00
Jeffrey Ko
4cd2ac8d40
Add advanced cash payment method 2018-11-23 20:50:03 +07:00
Manfred Karrer
15c776874e
Merge branch 'master' into release-candidate-0.9.0
# Conflicts:
#	.editorconfig
2018-11-23 11:24:07 +01:00
Chris Beams
b864a843ce
Remove Logback config xml from core module
Usually Bisq is run from its 'shadow jar', i.e. the executable fat jar
that collapses all dependencies and resources into a single file. In that
scenario, only a single 'logback.xml' is included in the fat jar and all
is well.

However, when Bisq is run with a normal external classpath, e.g. from
within IDEA, when using `gradle :desktop:run` or when running one of the
Gradle-generated shell scripts under desktop/build/scripts, multiple
'logback.xml' files are present on the classpath, which causes Logback
to complain with messages like the following:

    Found resource [logback.xml] at [file:.../desktop/build/resources/main/logback.xml]
    Resource [logback.xml] occurs multiple times on the classpath.
    Resource [logback.xml] occurs at [file:.../desktop/build/resources/main/logback.xml]
    Resource [logback.xml] occurs at [jar:file:.../core/build/libs/core.jar!/logback.xml]

Note the last line above. The presence of 'logback.xml' in the bisq-core
jar is the 'duplicate'. This is Logback's way of warning the user that
it doesn't know which file should be considered canonical. The only way
to avoid this error message (and the many other lines that get output
along with it) is to remove the offending duplicate file.

This commit removes logback.xml from core to solve the problem described
above. The file is unnecessary in the context of running bisq-desktop,
bisq-seednode, etc, and the only context in which it would actually be
used is when running BisqHeadlessAppMain in core. With that said, the
configuration in the core logback.xml file is identical to the default
Logback configuration, so removing the file has no effect on the logging
output from BisqHeadlessAppMain, and furthermore, it appears that
BisqHeadlessAppMain is not actually in use anywhere right now (it was
added some months ago in anticipation of integrating the new HTTP API,
but this has yet to occur).

In a future change, we should probably return the core module to being a
pure library, without any main methods, and introduce a different
module, e.g. 'daemon' that contains the equivalent of
BisqHeadlessAppMain and whatever logback.xml configuration is
appropriate for it. Doing things this way will avoid the 'duplicate'
errors shown above, because desktop, seednode, etc will not depend on
core module, but will not depend on the daemon module.
2018-11-23 06:42:02 +01:00
Christoph Atteneder
4c95d030e8
Adapt layout of popup windows 2018-11-21 15:31:49 +01:00
Christoph Atteneder
48b4c3ce9c
Increase first line padding 2018-11-21 11:49:57 +01:00
sqrrm
aa27d443a4
Display confiscated bond value 2018-11-17 23:13:13 +01:00
sqrrm
e577d0c4a9
Fix resource name 2018-11-17 23:13:13 +01:00
Manfred Karrer
aa05651ff4
Merge branch 'master' into release-candidate-0.9.0 2018-11-17 15:22:58 -05:00
Manfred Karrer
43ace0b659
Don't use a temp file for the sound file
We play a silent sound to prevent app nap and network disconnections.
Instead of a temp file which got deleted on exit and recreated each
startup we store it once in the data directory root.
Fixes https://github.com/bisq-network/bisq/issues/1931
2018-11-17 12:06:59 -05:00
Christoph Atteneder
dc69cac87e
Show error text without truncation 2018-11-14 17:07:17 +01:00
Christoph Atteneder
3d0aec5a92
Adapt Password, Wallet and Restore views 2018-11-14 11:51:04 +01:00
Manfred Karrer
a607852d36
Fix wording 2018-11-13 12:54:59 -05:00
Christoph Atteneder
7c774b9c7b
Improve layouting of balance to prevent truncation issues 2018-11-13 17:04:05 +01:00
Christoph Atteneder
0ac911bbdf
Adapt Arbitrator registration window 2018-11-13 15:58:50 +01:00
Christoph Atteneder
21aa91f41d
Adapt trade charts styles 2018-11-13 15:47:02 +01:00
Manfred Karrer
b852a6b94a
Merge branch 'master' into release-candidate-0.9.0 2018-11-12 20:36:47 -05:00
Manfred Karrer
87efe89662
Add proof of burn feature to dao 2018-11-11 12:56:54 -05:00
Manfred Karrer
5dbdfbfc29
Update displayStrings.properties 2018-11-10 13:27:00 -05:00
Manfred Karrer
d8bae356ff
Complete asset listing fee feature 2018-11-09 20:24:17 -05:00
aejontargaryen
dd6fd3a76e update altcoin info popups 2018-11-09 08:41:43 +00:00
Manfred Karrer
5a9ff12669
Merge branch 'release-candidate-0.9.0' into add-asset-listing-fee
# Conflicts:
#	desktop/src/main/java/bisq/desktop/util/GUIUtil.java
#	desktop/src/test/java/bisq/desktop/util/GUIUtilTest.java
2018-11-08 16:59:36 -05:00
Manfred Karrer
ca4a4a47ce
Add asset listing fee and proof of burn domain and views (WIP) 2018-11-08 16:44:58 -05:00
Christoph Atteneder
d843e73b7f
Adapt dispute flow to match new design 2018-11-08 17:08:51 +01:00
Christoph Atteneder
e7ea6c7c3a
Improve layout of About and Preferences 2018-11-08 10:40:12 +01:00
Christoph Atteneder
c046239338
Adapt tor network settings popup 2018-11-08 10:31:24 +01:00
Manfred Karrer
53e127f556
Add asset listing params 2018-11-07 20:56:22 -05:00
Christoph Atteneder
1082340701
Adapt user avatar info popup 2018-11-07 19:54:19 +01:00
Christoph Atteneder
78e01f92da
Clean up TradeDetailsWindow 2018-11-07 16:48:32 +01:00
Christoph Atteneder
3887d4b49c
Merge pull request #1892 from ripcurlx/adapt-trade-process
Redesign: Adapt trade process
2018-11-07 16:11:45 +01:00
Christoph Atteneder
729eacd6d0
Adapt trade process to new design 2018-11-07 14:43:00 +01:00
Manfred Karrer
3a03deb83a
Cleanup translation string for bond domain 2018-11-06 22:46:27 -05:00
Manfred Karrer
bee2d1ebd3
Cleanup bond domain 2018-11-06 14:58:12 -05:00
Manfred Karrer
edc1a35b15
Merge branch 'release-candidate-0.9.0' into complete-bonded-roles-impl 2018-11-06 12:40:50 -05:00
Manfred Karrer
c5630eec0f
Add support for confiscation of bonds 2018-11-06 00:42:17 -05:00
Manfred Karrer
8e3864589a
Complete bonds view 2018-11-05 21:26:00 -05:00
Manfred Karrer
7bf5c819cd
Implements bonded reputation
Still WIP with many areas...
2018-11-05 18:35:30 -05:00
Christoph Atteneder
d7f72c158b
Adapt TakeOffer to new design 2018-11-05 18:51:17 +01:00
Christoph Atteneder
4ed6989217
Adapt arbitrator registration view 2018-11-05 09:35:28 +01:00
Manfred Karrer
15b8f02c67
Work on bonded reputation (WIP) 2018-11-02 19:31:31 -05:00
Manfred Karrer
8ce8813e89
Complete handling of bonds for roles.
- Add BondedRoleState to reflect all diff. states.
- Show in UI correct state and button state for lockup/revoke
- Rename ProposalService classes to ProposalFactory
2018-11-02 16:09:53 -05:00
Manfred Karrer
32f709c2c9
Merge pull request #1858 from ripcurlx/create-offer-adaptions
Redesign: Create Offer flow adaptions
2018-11-02 11:40:19 -05:00
Christoph Atteneder
3167195f85
Different clean up tasks in the create offer process 2018-11-02 16:30:42 +01:00
Manfred Karrer
bc82974996
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:49:49 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
0d481ac084
Fix wrong linebreaks 2018-11-01 12:48:21 -05:00
Manfred Karrer
b3b080cfb2
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:04:23 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar
Improve grammar of Background Info
2018-11-01 12:03:07 -05:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00