mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,917 Commits 4 Branches 148 Tags 4.3 GiB
a8b833c285
Commit Graph

6917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
 2018-10-31 13:17:57 -05:00
Manfred Karrer
590fa427e7
Merge pull request #1849 from ripcurlx/minor-ui-fixes 
Redesign: Adapt Funds section
 2018-10-31 13:00:16 -05:00
Christoph Atteneder
1b4891eb1c
Fix vertical alignment in table views 2018-10-31 11:34:01 +01:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
1057739f7a
Remove colons in network settings 2018-10-31 09:37:11 +01:00
Christoph Atteneder
797c935a28
Use TextField with label on top 2018-10-31 09:37:10 +01:00
Christoph Atteneder
ce9c1ab459
Merge pull request #1847 from ManfredKarrer/adjust-with-redesign 
Adjust in DAO views with redesign
 2018-10-31 09:35:57 +01:00
Manfred Karrer
2d3269a07a
Add getBsqPrice method to PriceFeedService 2018-10-30 20:46:26 -05:00
Manfred Karrer
0c9a1ad1a7
Fix layout 2018-10-30 20:27:34 -05:00
Manfred Karrer
5ced4e8927
Use param type for switch cases 2018-10-30 20:27:21 -05:00
Manfred Karrer
8049588bc1
Use param type for switch cases 
- Add maxDecrease and maxIncrease properties to param
 2018-10-30 20:27:04 -05:00
Manfred Karrer
df15399fdc
Fix bonding views 2018-10-30 18:57:55 -05:00
Manfred Karrer
3d3a1acad6
Rename classes 2018-10-30 18:49:48 -05:00
Manfred Karrer
944acc9e93
Fix layout for governance screens 2018-10-30 18:49:04 -05:00
Manfred Karrer
090199c0c2
Fix layout for wallet screens 2018-10-30 17:28:11 -05:00
Manfred Karrer
5b946be713
Increase font size of group header to 1.308em 2018-10-30 15:53:28 -05:00
Manfred Karrer
6fe3cb7eda
Fix merge issues 2018-10-30 14:58:09 -05:00
Manfred Karrer
526a9f5442
Merge branch 'master' into release-candidate-0.9.0 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
 2018-10-30 14:03:12 -05:00
Manfred Karrer
423ac38bd4
Merge pull request #1842 from ManfredKarrer/fix-dao-layout-issues 
Adjust layout with new design
 2018-10-30 13:32:11 -05:00
Manfred Karrer
9888f93bfe
Merge pull request #1845 from j3ko/master 
add interac e-transfer question/answer validation
 2018-10-30 13:32:05 -05:00
Manfred Karrer
f958ccde67
Merge pull request #1841 from ManfredKarrer/make-param-value-string 
Add BTC address param, use String for param value instead of long
 2018-10-30 13:17:45 -05:00
Manfred Karrer
ef3e4ba905
Fix issue with not applied error msg in validator 2018-10-30 13:14:19 -05:00
Manfred Karrer
6902f9aa0d
Use 1.231em for group header font size 2018-10-30 13:14:01 -05:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Manfred Karrer
8566765996
Adjust layout with new design (WIP) 
- on css there are some changes marked with MK. @Christoph - please
check if those are ok for you, otherwise lets discuss...
- in Formbuilder there is removed the automatic setting of the column
span and index
- Add support for columnIndex as parameter
- setMouseTransparent for addTopLabelTextField is removed (we want that
user can copy text)
- Adjustments in the DAO code are WIP and can be ignored by @Christoph
 2018-10-30 01:06:59 -05:00
Manfred Karrer
2ba68a13b8
Fix missing param in test class 2018-10-29 21:47:57 -05:00
Manfred Karrer
dbbbf1717b
Merge branch 'release-candidate-0.9.0' into make-param-value-string 2018-10-29 21:43:11 -05:00
Manfred Karrer
ea33899123
Add BTC recipient address to params 
- Change type of param value from long to string for more flexibility
- Add BTC recipient address param
- Add validation, refactor param value formatter and param value parser
 2018-10-29 21:32:16 -05:00
Manfred Karrer
36838804c8
Merge pull request #1835 from ripcurlx/cleanup-altcoin-payment-accounts 
Clean up Altcoin payment accounts
 2018-10-29 10:58:21 -05:00
Manfred Karrer
9e0ada6337
Merge pull request #1836 from ripcurlx/merge-master-into-release-branch 
Merge master into release branch
 2018-10-29 10:57:46 -05:00
Manfred Karrer
a77be13e03
Merge pull request #1839 from ripcurlx/minor-fixes 
Minor ui fixes
 2018-10-29 10:56:56 -05:00
Christoph Atteneder
c031f68ddc
Clean up settings screens 2018-10-29 16:49:06 +01:00
Christoph Atteneder
71d64b19da
Clean up account section 2018-10-29 15:39:03 +01:00
Christoph Atteneder
f224f38050
Remove border focus in lists 2018-10-29 12:21:37 +01:00
Christoph Atteneder
f04ffafb89
Reduce padding for buttons within tables 2018-10-29 12:12:36 +01:00
Christoph Atteneder
0994bb96b9
Reposition Buy/Sell button 2018-10-29 12:12:00 +01:00
Christoph Atteneder
788bce0ff7
Clean up PromptPayForm 2018-10-29 11:14:37 +01:00
Christoph Atteneder
7d5e795714
Merge branch 'master' of github.com:bisq-network/bisq into merge-master-into-release-branch 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
 2018-10-29 11:14:07 +01: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
Christoph Atteneder
db540ab2e9
Clean up CryptoCurrencyForm 2018-10-29 10:55:31 +01:00
Christoph Atteneder
44a858becc
Clean up AccountsViews 2018-10-29 09:34:40 +01:00
Manfred Karrer
9b9fab2732
Merge branch 'release-candidate-0.9.0' into add-fiat-amount-to-fee 2018-10-28 22:11:01 -05:00
Manfred Karrer
509c3d1e10
Add trade fee display to take offer screen 
As take offer screen is WIP the fee display is also just a raw draft.
For the DAO state we should add a new group for the fee selection as
it is a bit lost in between the other fields...
 2018-10-28 17:01:44 -05:00
Manfred Karrer
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -05:00
Manfred Karrer
b5568b8f1c
Move fee toggle outside of box 2018-10-28 14:48:09 -05:00
Manfred Karrer
1350413050
Add filter for not adding null entries 2018-10-28 12:45:10 -05:00
Manfred Karrer
8ab9c2839d
Merge pull request #1831 from leshik/th-promptpay-integration 
Add PromptPay (Thailand)
 2018-10-28 12:42:18 -05: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
e266232b17
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-10-27 22:31:03 -05:00
Manfred Karrer
f005f22cba
Merge branch 'ripcurlx-redesign' into release-candidate-0.9.0 2018-10-27 22:28:33 -05:00