Manfred Karrer
|
cd04e1b0f9
|
Put new code for altcoin in right places.
|
2018-03-10 10:06:42 -05:00 |
|
Manfred Karrer
|
8754f41c1e
|
Merge branch 'master' of https://github.com/angelcoinmoney/exchange into angelcoinmoney-master
|
2018-03-10 10:01:41 -05:00 |
|
Manfred Karrer
|
0d45977913
|
Make constructor private, add Nullable.
|
2018-03-09 19:55:28 -05:00 |
|
Manfred Karrer
|
2afcef9eb5
|
Merge branch 'refactor-dao-data-model'
# Conflicts:
# core/src/main/java/io/bisq/core/dao/DaoModule.java
# core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockChain.java
# core/src/main/java/io/bisq/core/dao/blockchain/SnapshotManager.java
# core/src/main/java/io/bisq/core/dao/node/BsqNode.java
# core/src/main/java/io/bisq/core/dao/node/BsqParser.java
# core/src/main/java/io/bisq/core/dao/node/consensus/BsqTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/CompensationRequestController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/GenesisTxController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/IssuanceController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/PeriodController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxInputsController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/TxOutputController.java
# core/src/main/java/io/bisq/core/dao/node/consensus/VotingController.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNode.java
# core/src/main/java/io/bisq/core/dao/node/full/FullNodeParser.java
# core/src/main/java/io/bisq/core/dao/node/full/network/FullNodeNetworkManager.java
# core/src/main/java/io/bisq/core/dao/node/full/network/GetBsqBlocksRequestHandler.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNode.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeExecutor.java
# core/src/main/java/io/bisq/core/dao/node/lite/LiteNodeParser.java
# core/src/main/java/io/bisq/core/dao/request/compensation/CompensationRequestManager.java
# core/src/test/java/io/bisq/core/dao/node/full/FullNodeParserTest.java
|
2018-03-09 19:47:08 -05: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
|
456fd28e94
|
Revert "Fix parsertest"
|
2018-03-09 14:42:56 -05:00 |
|
Manfred Karrer
|
92514a25e8
|
Refactor BsqBlockChain with ReadModel and WriteModel
|
2018-03-09 00:43:20 -05:00 |
|
Manfred Karrer
|
8e99e7c1e6
|
Refactor OpReturnVerification.
|
2018-03-08 21:57:54 -05:00 |
|
Manfred Karrer
|
cf9fc6714d
|
Refactor check if a tx is a bsq tx.
|
2018-03-08 20:59:49 -05:00 |
|
Manfred Karrer
|
df093b9712
|
Remove TxVo and put fields into Tx instead.
|
2018-03-08 10:50:15 -05:00 |
|
Christoph Atteneder
|
7cc4a286b8
|
Change wording from distance to below/above
|
2018-03-07 13:17:19 +01:00 |
|
Manfred Karrer
|
b5ac9f97ca
|
Add vote reveal type. Adjust BSQ fees. Refactorings.
|
2018-03-05 22:00:13 -05:00 |
|
Manfred Karrer
|
b706edd15a
|
Merge branch 'show-past-comps' of https://github.com/sqrrm/exchange into sqrrm-show-past-comps
|
2018-03-05 18:03:16 -05:00 |
|
Manfred Karrer
|
4e66daed8d
|
Change display text. Remove dev value.
|
2018-03-05 12:15:25 -05:00 |
|
Manfred Karrer
|
b7064f9820
|
Add option key for dev mode
|
2018-03-05 11:10:00 -05:00 |
|
sqrrm
|
dd591a1a43
|
Add PastCompensationRequestView
Let Active and PastCompensationRequestView share a base class view
|
2018-03-05 16:58:06 +01:00 |
|
Manfred Karrer
|
aac493cc41
|
Add Restrictions with min and max comp request amounts. Refactor validator.
|
2018-03-05 10:33:25 -05:00 |
|
Manfred Karrer
|
a60f56c623
|
Merge branch 'compensation-req-checks' of https://github.com/sqrrm/exchange into sqrrm-compensation-req-checks
|
2018-03-05 09:39:42 -05:00 |
|
Manfred Karrer
|
a1befee0bd
|
Use common superclass for Create- and TakeOfferDataModel to avoid code duplication.
|
2018-03-01 18:47:38 -05:00 |
|
Angelcoin
|
22715c5731
|
Update CurrencyUtil.java
|
2018-02-27 14:09:55 +02:00 |
|
Manfred Karrer
|
1d0591084d
|
Merge branch '0.6.7'
# Conflicts:
# common/pom.xml
# common/src/main/java/io/bisq/common/app/Version.java
# common/src/main/resources/i18n/displayStrings.properties
# common/src/main/resources/i18n/displayStrings_hu.properties
# common/src/main/resources/i18n/displayStrings_ro.properties
# consensus/pom.xml
# core/pom.xml
# core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
# core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
# core/src/main/java/io/bisq/core/provider/fee/FeeService.java
# gui/pom.xml
# gui/src/main/java/io/bisq/gui/bisq.css
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
# gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
# gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
# gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
# gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
# gui/src/main/java/io/bisq/gui/util/GUIUtil.java
# monitor/pom.xml
# network/pom.xml
# network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
# package/linux/32bitBuild.sh
# package/linux/64bitBuild.sh
# package/linux/Dockerfile
# package/osx/create_app.sh
# package/osx/finalize.sh
# package/windows/32bitBuild.bat
# package/windows/64bitBuild.bat
# package/windows/Bisq.iss
# pom.xml
# seednode/pom.xml
# statistics/pom.xml
|
2018-02-26 22:03:47 -05:00 |
|
Manfred Karrer
|
fd47cefc6c
|
Set v0.6.7
|
2018-02-26 20:23:07 -05:00 |
|
Manfred Karrer
|
c19cf3c0cd
|
Merge pull request #1383 from blabno/feature/extract-USE_DEV_PRIVILEGE_KEYS-from-dev-env
Make USE_DEV_PRIVILEGE_KEYS flag configurable
|
2018-02-26 12:48:29 -05:00 |
|
Manfred Karrer
|
2c593559db
|
Merge 0.6.6 branch to master
|
2018-02-23 21:40:34 -05:00 |
|
Manfred Karrer
|
0b6edbb883
|
Set version 0.6.6
|
2018-02-23 15:41:24 -05:00 |
|
Chris Beams
|
b01af2e666
|
Refine text of per-trade limit info popup (#1388)
|
2018-02-23 21:38:05 +01:00 |
|
Manfred Karrer
|
a04f96335b
|
Add new altcoins: Cassubian Detk, DigiMoney, SpeedCash, SOS Coin, AchieveCoin, vDinar (#1385, #1381, #1377, #1370, #1369, #1367)
|
2018-02-23 11:10:06 -05:00 |
|
Manfred Karrer
|
2183227cf7
|
Rename "MoneyBeam" to "MoneyBeam (N26)" (#1349)
|
2018-02-23 10:11:52 -05:00 |
|
Manfred Karrer
|
82541e6fac
|
Add DeepOnion to main currencies list
|
2018-02-23 08:43:41 -05:00 |
|
Manfred Karrer
|
3e3fd3ab45
|
Remove DOGE as basecurrency
|
2018-02-23 08:35:41 -05:00 |
|
Manfred Karrer
|
6f342c8d5a
|
Add popup explaining trade limits #1388
|
2018-02-22 20:53:59 -05:00 |
|
Manfred Karrer
|
2389611c39
|
Re-enable national bank transfer for US
|
2018-02-22 19:54:13 -05:00 |
|
Manfred Karrer
|
e5a1953929
|
Add payment method Revolut #1312
|
2018-02-22 19:48:37 -05:00 |
|
Manfred Karrer
|
7a96181ccc
|
Merge pull request #1378 from stevenkain/patch-7
Update displayStrings.properties
|
2018-02-21 14:32:48 -05:00 |
|
Bernard Labno
|
051694dfdb
|
Make USE_DEV_PRIVILEGE_KEYS flag configurable
|
2018-02-21 16:29:57 +01:00 |
|
Christoph Atteneder
|
d377eec122
|
Merge pull request #1379 from stevenkain/patch-8
Update displayStrings_hu.properties
|
2018-02-21 09:23:32 +01:00 |
|
stevenkain
|
6af2fccb89
|
Update displayStrings_ro.properties
New Romanian translations
|
2018-02-20 23:08:35 +02:00 |
|
stevenkain
|
601bd9ea4e
|
Update displayStrings_hu.properties
New translations
|
2018-02-20 23:03:44 +02:00 |
|
stevenkain
|
f0a676bd33
|
Update displayStrings.properties
"both trades" makes no sense. Shouldn't it be "both traders"?
|
2018-02-20 22:41:35 +02:00 |
|
sqrrm
|
86c3516890
|
Fix comments from PR
|
2018-02-19 13:53:57 +01:00 |
|
Bernard Labno
|
5471a8c9ca
|
Not possible to select English anymore, if system locale is non-English
|
2018-02-19 11:08:44 +01:00 |
|
Manfred Karrer
|
649c14d28e
|
Merge pull request #1360 from ripcurlx/shorten-call-to-action-buttons
Shorten labels in call-to-action buttons in offer book
|
2018-02-18 21:29:44 -05:00 |
|
Manfred Karrer
|
dd86ead7d8
|
Add popmoney (#1273)
|
2018-02-18 20:20:04 -05:00 |
|
Manfred Karrer
|
378134c413
|
Add holder name to venmo
|
2018-02-18 19:38:44 -05:00 |
|
Manfred Karrer
|
a129d06863
|
Use Cashtag only for CashApp
|
2018-02-18 19:38:27 -05:00 |
|
Manfred Karrer
|
7654a5d8ff
|
Add payment method Venmo (#1347)
|
2018-02-18 19:08:03 -05:00 |
|
Manfred Karrer
|
beaaf59b70
|
Add feature for deactivating an offer #1368
|
2018-02-18 14:45:02 -05:00 |
|
sqrrm
|
fa2c33e5d1
|
Check that min comp req is more than comp req fee
|
2018-02-17 16:54:48 +01:00 |
|
sqrrm
|
a5364c9f3f
|
Display txid for compensation requests
|
2018-02-14 16:16:42 +01:00 |
|
Christoph Atteneder
|
04e5cef9ee
|
Rename singular/plural translation keys to make it less error-prune and add missing translations for all locales
|
2018-02-14 12:56:08 +01:00 |
|