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

7853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Atteneder
be70eb1b83
Merge branch 'master' of github.com:bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
 2019-01-14 15:06:07 +01:00
Christoph Atteneder
ef106858a0
Merge pull request #2250 from ManfredKarrer/refactor-trademanager-setup 
Refactor balances and trademanager setup
 2019-01-14 14:46:15 +01:00
Christoph Atteneder
bfda268eaf
Merge pull request #2248 from devinbileck/improve-JAVA_HOME-override 
Improve JAVA_HOME override
 2019-01-14 11:33:53 +01:00
Christoph Atteneder
265b15150b
Merge pull request #2252 from ManfredKarrer/reduce-code-duplication 
Move util code from UI to core
 2019-01-14 11:30:45 +01:00
Christoph Atteneder
4b283f6a57
Merge pull request #2264 from devinbileck/fix-failing-test 
Fix CurrencyListTest when locale is not en_US
 2019-01-14 11:08:04 +01:00
Devin Bileck
7a16b3f3c6
Fix CurrencyListTest when locale is not en_US 
When declaring a fiat currency and only providing the currency code,
it uses the system locale to get the currency display name.
This potentially causes different sorting results in
testUpdateWhenNotSortNumerically when locale is not en_US.

Now, it specifies the en_US locale when defining the fiat currencies
for this test.

Fixes https://github.com/bisq-network/bisq/issues/2259
 2019-01-13 22:27:06 -08:00
Manfred Karrer
3c35f46b64
Move util code from UI to core 
Move code to OfferUtil and PaymentAccountUtil to avoid code duplication
once http-API gets merged
 2019-01-12 00:14:55 +01:00
Manfred Karrer
9d42031187
Move setup code for tradeManager to onAllServicesInitialized method 2019-01-11 22:00:46 +01:00
Manfred Karrer
74c2c0cf61
Refactor BalanceModel to Balances 
- Remove BalanceModel
- Add Balances (pure domain model)
- Add BalancePresentation (shared presentation model in core)
- Move domain listener callbacks which can trigger balance update
to Balances
 2019-01-11 21:42:29 +01:00
Devin Bileck
ed7a7df2ad
Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
#	desktop/package/linux/rpm.sh
 2019-01-11 11:36:23 -08:00
Devin Bileck
cad6b61ffd
Improve JAVA_HOME override 
Check to see if javapackager exists prior to overriding JAVA_HOME
in package scripts.
 2019-01-11 11:30:34 -08:00
Manfred Karrer
6e753a29f7
Merge pull request #2246 from ripcurlx/fix-ignored-test-cases 
Fix ignored tests
 2019-01-11 17:46:54 +01:00
Christoph Atteneder
fe864724f3
Configure jMockit for desktop module 2019-01-11 16:59:18 +01:00
Christoph Atteneder
e31a314904
Fix ignored test cases 2019-01-11 16:17:56 +01:00
Christoph Atteneder
ce988eb767
Fix wrong alphabetical order 2019-01-11 15:03:08 +01:00
Christoph Atteneder
493592b8c9
Merge pull request #2238 from nezero/master 
List DeepOnion (ONION)
 2019-01-11 14:54:17 +01:00
Liam Alford
74e4f9027c List DeepOnion (ONION) 
Official project URL: https://deeponion.org/
Official block explorer URL: https://explorer.deeponion.org/
 2019-01-11 13:41:38 +00:00
Christoph Atteneder
d8cdd5a24a
Merge pull request #2228 from remus-persona/list-persona-asset 
List Persona (PRSN)
 2019-01-11 14:13:38 +01:00
Christoph Atteneder
0a25fbcc96
Merge pull request #2236 from farsider350/AustraliaCash-AUS 
List AustraliaCash (AUS)
 2019-01-11 14:12:52 +01:00
Manfred Karrer
c2043b5f3d
Merge pull request #2241 from blabno/bugfix/asset-sorting 
Sort assets
 2019-01-11 13:27:44 +01:00
Bernard Labno
9a85e67d48
Sort assets 2019-01-11 13:17:21 +01:00
Manfred Karrer
1a77ee669c
Merge pull request #2237 from ripcurlx/fix-chart-rendering 
Clear and re-assign series to fix rendering issues.
 2019-01-10 23:48:40 +01:00
Christoph Atteneder
190d2d5122
Clear and re-assign series to fix rendering issues. 
Fixes #2136.
 2019-01-10 15:08:23 +01:00
Jason-farsider350
151d08015e List AustraliaCash (AUS) 
Author: farsider350 farsider350@protonmail.com
Date: Sat Jan 5 02:10AM GMT+1000

List AusCash (AUS)

Official project URL: https://australiacash.org
Official block explorer URL: http://auscashexplorer.org
 2019-01-10 15:08:22 +10:00
Manfred Karrer
f25d8c85de
Merge pull request #2233 from blabno/feature/alt-coin-disclaimer 
Altcoin disclaimer
 2019-01-09 13:15:21 +01:00
Bernard Labno
7e9bc1fee8
Altcoin disclaimer 2019-01-09 12:24:35 +01:00
Remus Golgot
26c26fa0df List Persona (PRSN) 2019-01-09 09:54:12 +02:00
Christoph Atteneder
d320380e80
Set back to SNAPSHOT 2019-01-08 19:56:23 +01:00
Christoph Atteneder
b18a143c0c
Bump version number 2019-01-08 19:54:33 +01:00
Christoph Atteneder
0f218598f5
Merge pull request #2224 from ManfredKarrer/add-validation-for-tradestatistics 
Add validation for trade statistics
 2019-01-08 19:22:40 +01:00
Manfred Karrer
00722129cb
Add validation for trade statistics 
We got a trade statistics object with price and amount 0. Unclear why
that can happen (maybe some dev was debugging things or it was created
with the API). We need to add validation when creating and publishing
a trade statistics object as well. This is just a fast fix for getting
a new release out.

Fixes #2222 and #2223
 2019-01-08 18:56:04 +01:00
Devin Bileck
24ecbcdfb3
Merge branch 'master' of https://github.com/bisq-network/bisq into rpm-package 
# Conflicts:
#	desktop/package/linux/package.sh
#	desktop/package/linux/rpm.sh
 2019-01-08 09:26:43 -08:00
Christoph Atteneder
307a5b8822
Set back to SNAPSHOT 2019-01-08 16:48:22 +01:00
Christoph Atteneder
d6543377cf
Bump version number 2019-01-08 16:37:28 +01:00
Christoph Atteneder
7c4fcfa43d
Adapt for changed build directories 2019-01-08 16:36:26 +01:00
Manfred Karrer
951c878090
Update DaoStateStore 2019-01-08 15:25:42 +01:00
Manfred Karrer
c6e6d55465
Fix test 2019-01-08 15:23:34 +01:00
Manfred Karrer
7ced5d74eb
Update mainCryptoCurrencies 2019-01-08 15:11:40 +01:00
Manfred Karrer
cfb308f98b
Add more logs 2019-01-08 14:52:10 +01:00
Manfred Karrer
f5270ed559
Add log 2019-01-08 13:44:28 +01:00
Manfred Karrer
93c8f36410
Fix getBsqStateBuilder bug 
putAllUnspentTxOutputMap was used 2 times instead of
putAllNonBsqTxOutputMap
 2019-01-08 13:39:23 +01:00
Manfred Karrer
d6a5798003
Add check to avoid division with 0 2019-01-08 13:23:09 +01:00
Christoph Atteneder
cd5ead91c5
Update DataStateStore db on Testnet 2019-01-08 11:28:36 +01:00
Christoph Atteneder
9536223d52
Added Persian 2019-01-08 11:07:57 +01:00
Christoph Atteneder
d1221f662f
Update newly added assets 2019-01-08 11:00:08 +01:00
Christoph Atteneder
5f5e153d66
Add script for updating store dbs 2019-01-08 10:52:48 +01:00
Christoph Atteneder
9e237be841
Update translations 2019-01-08 09:48:36 +01:00
Christoph Atteneder
a664989a75
Update dbs (except DaoStateStore which had less file size) 2019-01-08 09:37:57 +01:00
Christoph Atteneder
9941a7dbc0
Merge pull request #2218 from ManfredKarrer/list-beam 
Add Beam
 2019-01-08 09:22:27 +01:00
Christoph Atteneder
6c150737c5
Merge pull request #2220 from ManfredKarrer/only-show-enabled-assets 
Don't show filtered currencies
 2019-01-08 09:05:07 +01:00