Commit graph

74 commits

Author SHA1 Message Date
The Blur Network
bf283dce10 Blur: Add instructions for GUI Wallet in pop-up
* Clarify existing instructions for CLI Wallet
* Provide instruction to retrieve information from GUI Wallet
* Ensure responsibilities are non-ambiguous with regard to burden of responsibility.
* Fix formatting with newlines
2018-11-28 18:00:20 -05: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
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
Manfred Karrer
5dbdfbfc29
Update displayStrings.properties 2018-11-10 13:27:00 -05:00
aejontargaryen
dd6fd3a76e update altcoin info popups 2018-11-09 08:41:43 +00:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -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
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning
Add warning popup for cash deposit
2018-10-29 10:59:30 +01:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand)
Closes https://github.com/bisq-network/payment-methods/issues/6.
2018-10-28 20:25:37 +07:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit 2018-10-26 21:48:41 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements
Persitence of DAO state
2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
2018-10-17 11:02:34 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements 2018-10-16 11:32:07 -05:00
Manfred Karrer
aeebae9297
Support trade fees defined DAO params
- Use DAO Params to get the trade fees
- Rename existing params
- Add min fee values
2018-10-10 15:02:38 -05:00
Manfred Karrer
e99d733642
Remove PHASE_BREAK4, adjust phase periods and fees 2018-10-10 13:39:51 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
3e7eba8f04
Add Generic- and removeAsset proposals 2018-10-04 23:24:14 -05:00
Manfred Karrer
072cedc29b
Improve param change selection (WIP)
- Show current formatted value
- Parse input to correct domain value
- Add validation (WIP)
- Add boundary checks (WIP)
2018-10-04 21:36:17 -05:00
Manfred Karrer
ccdac8e20b
Add new items to Param
- Add COMPENSATION_REQUEST_MIN_AMOUNT and COMPENSATION_REQUEST_MAX_AMOUNT
As BSQ based validation values can change over time if BSQ value
rise we need to support that in the Params as well.

- Add validateParamValue to ChangeParamValidator
2018-10-04 20:28:17 -05:00
Manfred Karrer
1b8863652c
Merge branch 'master' into DAO-improvements 2018-10-04 10:40:42 -05:00
Manfred Karrer
0c8d475c24
Improve string 2018-10-03 17:58:01 -05:00
fotispap
c305a3cb03 Remove age from limitations of altcoin accounts 2018-10-03 22:26:50 +02:00
Manfred Karrer
cb17b008a3
Remove arbitrator selection view 2018-10-02 22:35:16 -05:00
Manfred Karrer
2b5731ce7f
Add buyers payment account name to trade screen
In case the buyer has setup multiple accounts for a payment method
we show the used payment account for that offer in the trade screen.

See: https://github.com/bisq-network/bisq/issues/1733
2018-09-28 12:04:09 -05:00
Manfred Karrer
b03aab24b7
Change label for network selector 2018-09-25 21:03:02 -05:00
Manfred Karrer
86086c1e09
Adjust trade popup text for XMR
Fixes https://github.com/bisq-network/bisq/issues/1555
2018-09-24 13:01:33 -05:00
Christoph Atteneder
95f42fed21
Merge pull request #1716 from ManfredKarrer/small-improvements
Small improvements
2018-09-24 06:31:57 +02:00
Manfred Karrer
f0471bccfd
Warn user when closing with open offers
Fixes https://github.com/bisq-network/bisq/issues/1663
2018-09-23 13:48:01 -05:00
Manfred Karrer
38e910c366
Add contact info for seller in case of aa F2F trade
Fixes: https://github.com/bisq-network/bisq/issues/1707#issuecomment-423724283
2018-09-22 18:59:15 -05:00
Manfred Karrer
416d9ba8f3
Play silent sound to avoid standby mode
Apple disabled options do avoid App Nap in recent OSX versions.
Playing an inaudible sound marks the application for preventing to get
set to standby mode as well as App Nap mode.
The alternative to that "hack" would be to add OSX native code, but
even then it is likely only possible to prevent App Nap but not
sleep mode.
If Bisq is in App Nap mode offers cannot be taken as well the user loses
network connection and offers.
See: https://github.com/bisq-network/bisq/issues/1701
2018-09-21 14:50:03 -05:00
Manfred Karrer
705025fea9
Add info for Faster Payment that the receivers name is not required
See:
https://github.com/bisq-network/bisq/issues/1693
2018-09-18 17:34:58 -05:00
Manfred Karrer
824d231a69
Add Citibank to supported Zelle banks
See: https://github.com/bisq-network/payment-methods/issues/10
2018-09-15 09:54:14 -05:00
Aruna Surya
cd5c5eda65
Improve grammar of Welcome text 2018-09-13 20:01:10 +02:00
Aruna Surya
a89d22118d
Improve grammar of seed info 2018-09-11 21:40:40 +02:00
Christoph Atteneder
049655b685
Merge core repository at 4597613 2018-09-05 10:48:22 +02:00
Chris Beams
970095f9ab
Move core module to new bisq-core repository 2018-03-10 17:29:25 +01:00
Manfred Karrer
dd5fe5d197
Use Interface for read and write access to BsqBlcokChain. Use SingleThreadExecutor in Full- and LiteNodeExecutor. 2018-03-09 19:45:40 -05:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
81bf4b65d4 Use sets instead of lists, fix threading issues 2015-11-05 23:23:15 +01:00