Skip to content

Conversation

@jahsus-waves
Copy link
Contributor

No description provided.

Max Axenov and others added 21 commits August 20, 2019 16:29
…erbook

DEXW-1884: short mode for nice number in orderbook to false
…from-api

# Conflicts:
#	src/modules/utils/modals/receive/receiveCryptocurrency/ReceiveCryptocurrency.js
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch dexw-2043-get-min-max-from-api
# Your branch is up to date with 'origin/dexw-2043-get-min-max-from-api'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   configs/mainnet.json
#	modified:   configs/stagenet.json
#	modified:   configs/testnet.json
#	modified:   data-service/classes/DataManager.ts
#	new file:   locale/de/app.migrate.json
#	new file:   locale/de/app.signUp.json
#	modified:   locale/de/app.utils.json
#	new file:   locale/en/app.migrate.json
#	new file:   locale/en/app.signUp.json
#	modified:   locale/en/app.utils.json
#	new file:   locale/es/app.migrate.json
#	new file:   locale/es/app.signUp.json
#	modified:   locale/es/app.utils.json
#	new file:   locale/et_EE/app.migrate.json
#	new file:   locale/et_EE/app.signUp.json
#	modified:   locale/et_EE/app.utils.json
#	modified:   locale/fr/app.dex.json
#	modified:   locale/fr/app.import.json
#	modified:   locale/fr/app.ledger.json
#	new file:   locale/fr/app.migrate.json
#	modified:   locale/fr/app.restore.json
#	new file:   locale/fr/app.signUp.json
#	modified:   locale/fr/app.ui.json
#	modified:   locale/fr/app.utils.json
#	modified:   locale/fr/app.welcome.json
#	new file:   locale/hi_IN/app.migrate.json
#	new file:   locale/hi_IN/app.signUp.json
#	modified:   locale/hi_IN/app.utils.json
#	new file:   locale/id/app.migrate.json
#	new file:   locale/id/app.signUp.json
#	modified:   locale/id/app.utils.json
#	new file:   locale/it/app.migrate.json
#	new file:   locale/it/app.signUp.json
#	modified:   locale/it/app.utils.json
#	new file:   locale/ja/app.migrate.json
#	new file:   locale/ja/app.signUp.json
#	modified:   locale/ja/app.utils.json
#	new file:   locale/ko/app.migrate.json
#	new file:   locale/ko/app.signUp.json
#	modified:   locale/ko/app.utils.json
#	new file:   locale/nl_NL/app.migrate.json
#	new file:   locale/nl_NL/app.signUp.json
#	modified:   locale/nl_NL/app.utils.json
#	new file:   locale/pl/app.migrate.json
#	new file:   locale/pl/app.signUp.json
#	modified:   locale/pl/app.utils.json
#	new file:   locale/pt_BR/app.migrate.json
#	new file:   locale/pt_BR/app.signUp.json
#	modified:   locale/pt_BR/app.utils.json
#	new file:   locale/pt_PT/app.migrate.json
#	new file:   locale/pt_PT/app.signUp.json
#	modified:   locale/pt_PT/app.utils.json
#	new file:   locale/ru/app.migrate.json
#	new file:   locale/ru/app.signUp.json
#	modified:   locale/ru/app.tokens.json
#	modified:   locale/ru/app.utils.json
#	new file:   locale/tr/app.migrate.json
#	new file:   locale/tr/app.signUp.json
#	modified:   locale/tr/app.utils.json
#	new file:   locale/zh_CN/app.migrate.json
#	new file:   locale/zh_CN/app.signUp.json
#	modified:   locale/zh_CN/app.utils.json
#	modified:   package.json
#	renamed:    src/img/assets/bncr.svg -> src/img/assets/bnt.svg
#	modified:   src/index.hbs
#	modified:   src/modules/app/services/DefaultSettings.js
#	modified:   src/modules/dex/directives/dexBlock/dexBlock.less
#	modified:   src/modules/dex/directives/orderBook/OrderListItem.js
#	modified:   src/modules/ui/directives/assetInfoHead/AssetInfoHead.js
#	modified:   src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js
#	modified:   src/modules/ui/directives/table/table.less
#	modified:   src/modules/utils/services/Storage.js
#	modified:   src/modules/utils/services/gateways/WavesGatewayService.js
#	modified:   src/modules/utils/services/outerBlockchains.js
#	modified:   src/modules/utils/services/utils.js
#	modified:   src/modules/utils/services/whatsNew.js
#
…form/WavesGUI into dexw-2043-get-min-max-from-api
…form/WavesGUI into dexw-2043-get-min-max-from-api
@jahsus-waves jahsus-waves merged commit 8a6546e into master Aug 26, 2019
@tsigel tsigel deleted the dexw-2040-release-1.3.19 branch September 19, 2019 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants