mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
6850 commits 3 branches 150 tags 4.1 GiB
Commit graph

83 commits

Author SHA1 Message Date
Manfred Karrer
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -05:00
Manfred Karrer
3884607114
Add fee toggle in create offer screen 
Implementation is not complete yet. It is missing the handling for the
not BSQ enabled case and applying to to the take offer screen.
 2018-10-27 17:52:50 -05:00
Manfred Karrer
235e2fa9f1
Add fiat amount to trade fees at maker 2018-10-26 17:29:39 -05:00
Manfred Karrer
4f52f227d6
Small UI improvements 
- Remove arrow for show all and edit list
- Remove colons
- Remove progressbar style in dao phases
 2018-10-25 21:52:41 -05:00
Manfred Karrer
80cb50a717
Remove colons, remove progressbar style in dao phases 2018-10-25 21:16:21 -05:00
Manfred Karrer
7969374a4a
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
 2018-10-25 19:59:00 -05:00
Christoph Atteneder
e99d860f16
Clean up CashDeposit Form and all changes related 2018-10-25 12:11:10 +02:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Christoph Atteneder
45060575bd
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-24 13:52:49 +02:00
Christoph Atteneder
0c01093614
Style main state of account sub views to match design template and refactor GUI stuff on the way 2018-10-23 17:46:56 +02:00
Christoph Atteneder
db2cda1355
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/build.gradle
 2018-10-22 19:27:31 +02:00
Christoph Atteneder
01cf2a46cb
Adapt preference view to match design template 2018-10-22 17:47:01 +02: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
Christoph Atteneder
9740a97bbf
Add missing translations for market provider info 2018-10-19 16:51:50 +02: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
Christoph Atteneder
29adc6b472
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-16 19:38:16 +02:00
Christoph Atteneder
dd568111a5
Update translations without colons 2018-10-16 19:35:05 +02: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
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
 2018-10-16 10:09:37 +02: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
Christoph Atteneder
a07f984e7e
Adapt Offer Book View 2018-09-28 17:27:22 +02: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
3bb503d289
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-09-24 11:34:05 +02:00
Christoph Atteneder
a22e5d5b2b
Adapt create offer screen 2018-09-24 11:31:41 +02: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
Christoph Atteneder
fd07bff243
Fix padding and use translation keys 2018-09-20 16:38:27 +02:00
Christoph Atteneder
de48516a04
Use JFXComboBox for filtering with label on top 2018-09-20 12:11:57 +02:00
Christoph Atteneder
cf7884d864
Add password field behavior with floating text 2018-09-19 09:09:31 +02: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