diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-12-19 22:16:35 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-12-19 22:16:35 +0800 |
| commit | 293dadc22aedcaf540f2dc17c8c38087e7ace037 (patch) | |
| tree | 79f624ab03071a28da83c7bf542acfe0dd7af8cb /packages/website/translations/english.json | |
| parent | ddf3bb7c0446f2d85b6fa55cbe0b00b227f08af7 (diff) | |
| parent | 040b402b6d558d13f2f4e032297b6723cdf2aafe (diff) | |
| download | dexon-0x-contracts-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.gz dexon-0x-contracts-293dadc22aedcaf540f2dc17c8c38087e7ace037.tar.zst dexon-0x-contracts-293dadc22aedcaf540f2dc17c8c38087e7ace037.zip | |
Merge branch 'development' into website/addPySRA
* development: (141 commits)
Add missing CHANGELOG entry for OrderWatcher WS interface
Bump up stale to close to 30 days
Move onMessageAsync outside of tests and add comments
Fix WS tests to remove race-condition and be more specific about the message expected
Add temporary console.log to test failing on CI
Make @0x/contracts-test-utils a dependency instead of a devDependency
Fix test-publish failure in contracts packages
Fixed solhint errors
Added documentation to `LibAddressArray.append` and switched `if` to `require` smt
Updated changelogs for new contracts
Added `gas` field so tests pass on Geth;
Added Changelog for new Extensions
Updated comment `Execute fillOrder` -> `Execute exchange function`
Explicit returns
Prettier / Linter on contracts + TS
Refactoring balance threshold filter
Moved exchange calldata functions to separate mixin
Less Assembly. More Solidity. Less Efficiency. More Readability.
Run all tests for extensions
Cleaned up tests for balance threshold filter
...
Diffstat (limited to 'packages/website/translations/english.json')
| -rw-r--r-- | packages/website/translations/english.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/website/translations/english.json b/packages/website/translations/english.json index 78f29d0f6..2914ffead 100644 --- a/packages/website/translations/english.json +++ b/packages/website/translations/english.json @@ -92,6 +92,9 @@ "ORDER_BASICS_DESCRIPTION": "Tutorial on how to create, validate and fill an order using 0x", "USE_NETWORKED_LIQUIDITY": "use networked liquidity", "USE_NETWORKED_LIQUIDITY_DESCRIPTION": "Learn how to tap into networked liquidity using the Standard Relayer API", + "INTEGRATE_0X_INSTANT": "add seamless purchasing of crypto assets to your website or app", + "INTEGRATE_0X_INSTANT_DESCRIPTION": + "learn how to use 0x Instant or AssetBuyer to give your users the power of purchasing crypto assets using 0x", "VIEW_ALL_DOCUMENTATION": "view all documentation", "SANDBOX": "0x.js sandbox", "GITHUB": "github", |