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

2271 commits

Author SHA1 Message Date
Manfred Karrer
235e2fa9f1
Add fiat amount to trade fees at maker 2018-10-26 17:29:39 -05:00
Manfred Karrer
1175320ed1
Add comment 2018-10-25 21:58:02 -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
Christoph Atteneder
d0ed219484
Comment out unused code block 2018-10-25 10:50:26 +02:00
sqrrm
7be08fee9c
FIx typo 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2018-10-24 18:28:08 -05: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
Manfred Karrer
bccecc1f16
FIx missing arguments in test 2018-10-23 12:42:05 -05:00
Manfred Karrer
501050de6f
Add getUnusedBsqAddressAsString method 2018-10-23 11:56:11 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05: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
cdaba9d15d
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/build.gradle
 2018-10-23 09:22:31 +02:00
Manfred Karrer
d80af564ed
Move javafx dependencies to common 
For the upcoming API work we use java fx classes also in common (PR
is pending), so that is one reason to move that. But there was also an
issue on Linux (travis) as the platform property was not set in the
core gradle build file, but it is already defined in common.
 2018-10-22 16:01:02 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core 
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
 2018-10-22 13:17:06 -05: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
15177e6537
Add comment 2018-10-17 14:21:31 -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
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file 
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
 2018-10-16 23:21:11 -05:00
Manfred Karrer
8e46b1760f
Add new storage type to p2p library 
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
 2018-10-16 23:16:52 -05:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Christoph Atteneder
95fa81361e
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 19:45:50 +02:00
Manfred Karrer
dabe6907e1
Fix missing sorting 2018-10-16 12:40:10 -05: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
254059b411
Fix typo 2018-10-16 11:57:50 -05: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
sqrrm
b3c8610f10
Add bonded reputation service, storage 2018-10-16 17:11:40 +02: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
sqrrm
7b72f10eb2
Add bonded reputation 2018-10-14 12:51:36 +02:00
sqrrm
b9d6b3a007
Add interface for BondedRole to allow for more generic bonds 2018-10-13 12:31:02 +02:00
Manfred Karrer
5879dd98df
Change log level for printing asset trade stats 2018-10-10 15:34:02 -05:00
Manfred Karrer
62a824653d
Update comments 2018-10-10 15:33:01 -05:00
Manfred Karrer
c3f508e24c
Adjust DAO params 2018-10-10 15:20:17 -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