aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge v2-prototypeFabio Berger2018-07-1858-3300/+1845
|\
| * Merge pull request #887 from 0xProject/feature/order-watcher-v2Leonid Logvinov2018-07-1858-3301/+1846
| |\
| | * Fix a bad mergeLeonid Logvinov2018-07-1817-50/+100
| | * Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1830-252/+309
| | |\ | | |/ | |/|
| | * Merge branch 'feature/order-watcher-v2' of github.com:0xProject/0x-monorepo i...Leonid Logvinov2018-07-180-0/+0
| | |\
| | | * Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1832-249/+581
| | | |\
| | | * \ Merge pull request #879 from 0xProject/feature/order-watcher-erc721-testsLeonid Logvinov2018-07-1820-288/+462
| | | |\ \
| | | | * | Add a test for ERC721 AllowanceLeonid Logvinov2018-07-181-1/+37
| | | | * | Use allowance instead of approval for all in fill-scenariosLeonid Logvinov2018-07-181-4/+7
| | | | * | Upgrade sha3 to 1.2.2 to work with node v10Leonid Logvinov2018-07-171-4/+4
| | | | * | Check if the token doesn't exist before minting in fill scenariosLeonid Logvinov2018-07-172-3/+10
| | | | * | Make downlevelIteration a global configLeonid Logvinov2018-07-173-3/+2
| | | | * | Fix tests descriptionsLeonid Logvinov2018-07-171-2/+2
| | | | * | DRY up the code in order-watcher collision-resistant abi decoderLeonid Logvinov2018-07-171-13/+9
| | | | * | Await transactions in fillScenariosLeonid Logvinov2018-07-172-5/+9
| | | | * | Rename decodeAssetData to decodeAssetDataOrThrowLeonid Logvinov2018-07-177-12/+12
| | | | * | Use normalizedAddressLeonid Logvinov2018-07-171-1/+1
| | | | * | Make addOrder asyncLeonid Logvinov2018-07-162-17/+17
| | | | * | Await the promise in order watcher assertionLeonid Logvinov2018-07-161-1/+1
| | | | * | Merge branch 'feature/order-watcher-v2' into feature/order-watcher-erc721-testsLeonid Logvinov2018-07-1666-10413/+10636
| | | | |\ \ | | | | |/ / | | | |/| |
| | | | * | Yarn lock changesLeonid Logvinov2018-07-161-17/+4
| | | | * | Import AssetproxyIdLeonid Logvinov2018-07-161-1/+1
| | | | * | Add ERC721 tests to order watcherLeonid Logvinov2018-07-162-4/+64
| | | | * | Enable downlevelIterationLeonid Logvinov2018-07-161-0/+1
| | | | * | Register asset types within collisionResistantAbiDecoderLeonid Logvinov2018-07-161-0/+14
| | | | * | Add ERC721 support to fill-scenariosLeonid Logvinov2018-07-164-226/+292
| | | | * | Remove no-unused-variable rule from tslint as it's buggy and has side-effectsLeonid Logvinov2018-07-161-1/+0
| | | | * | Don't throw on transferFrom is the sender is an ownerLeonid Logvinov2018-07-161-9/+11
| | | | * | Pass erc721ProxyAddress to fillScenariosLeonid Logvinov2018-07-161-2/+2
| | | | * | Fix postinstall hook for contracts -> typesLeonid Logvinov2018-07-161-1/+1
| | * | | | MergeLeonid Logvinov2018-07-1825-401/+590
| | * | | | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-18166-615/+1086
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1666-10416/+10639
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix a dependency versionLeonid Logvinov2018-07-131-1/+1
| | * | | | Migrate order-watcher to v2Leonid Logvinov2018-07-1316-550/+893
| | * | | | Enable prefer-readonly ruleLeonid Logvinov2018-07-131-0/+3
| | * | | | Add OrderWatcherPartialConfigSchemaLeonid Logvinov2018-07-131-0/+13
| | * | | | Use migrated package versions as order-watcher dependenciesLeonid Logvinov2018-07-131-7/+7
| | * | | | Update compact_artifacts in order-watcherLeonid Logvinov2018-07-1310-1740/+258
| | * | | | Export newly created store from order-utilsLeonid Logvinov2018-07-132-0/+17
| | * | | | Add OrderFilledCancelledLazyStoreLeonid Logvinov2018-07-131-0/+65
| | * | | | Add AbstractOrderFilledCancelledLazyStoreLeonid Logvinov2018-07-131-0/+12
| | * | | | Export forgotten stuff from contract-wrappersLeonid Logvinov2018-07-132-5/+14
| | * | | | Make getZRXAssetData not asyncLeonid Logvinov2018-07-131-3/+4
| | * | | | Add order-watcher to a postinstall HACKLeonid Logvinov2018-07-131-1/+1
| | * | | | Add no-return-await, no-duplicate-switch-case, no-implicit-dependencies rulesLeonid Logvinov2018-07-131-0/+3
| | * | | | Upgrade tslint to use prefer-readonlyLeonid Logvinov2018-07-1328-35/+36
| | * | | | Update contract artifactsLeonid Logvinov2018-07-1311-804/+40
* | | | | | Update package versionsFabio Berger2018-07-1826-149/+149
* | | | | | Update changelogsFabio Berger2018-07-1842-5/+277
|/ / / / /
* | | | | Merge pull request #884 from 0xProject/export-more-0x.jsFabio Berger2018-07-1831-255/+312
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | edit changelog messageFabio Berger2018-07-181-1/+1
| * | | | Fix prettierFabio Berger2018-07-182-9/+3
| * | | | Fix linterFabio Berger2018-07-182-2/+1
| * | | | merge v2-prototypeFabio Berger2018-07-1817-161/+518
| |\ \ \ \
| * | | | | Rename decodeAssetDataId to decodeAssetProxyId for consistencyFabio Berger2018-07-185-13/+13
| * | | | | Add java doc comments to assetDataUtilsFabio Berger2018-07-181-1/+34
| * | | | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ...Fabio Berger2018-07-186-31/+43
| * | | | | Export missing types and add to doc ref whitelistFabio Berger2018-07-172-0/+30
| * | | | | Remove unused depFabio Berger2018-07-171-1/+0
| * | | | | Fix typingFabio Berger2018-07-171-1/+1
| * | | | | Move type decl. to typescript-typingsFabio Berger2018-07-172-8/+8
| * | | | | Add PRFabio Berger2018-07-171-1/+2
| * | | | | Make assetData a static property and add to CHANGELOGFabio Berger2018-07-172-1/+4
| * | | | | Export assetDataUtils from 0x.jsFabio Berger2018-07-171-0/+5
| * | | | | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-1722-223/+204
* | | | | | Merge pull request #883 from 0xProject/feature/tslint-improvementsLeonid Logvinov2018-07-18140-365/+421
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix tslint issuesLeonid Logvinov2018-07-17113-323/+354
| * | | | | Upgrade tslint to the newest versionLeonid Logvinov2018-07-1727-27/+27
| * | | | | Add new tslint rulesLeonid Logvinov2018-07-171-0/+19
| * | | | | Sort the config file lexicographicallyLeonid Logvinov2018-07-161-26/+31
* | | | | | Fix an inconsistency in abi-gen CHANGELOG.jsonLeonid Logvinov2018-07-181-9/+4
| |_|/ / / |/| | | |
* | | | | Merge pull request #857 from 0xProject/feature/contracts/batchGetOrderInfoAmir Bandeali2018-07-186-12/+344
|\ \ \ \ \
| * | | | | Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-183-5/+311
| * | | | | Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
| * | | | | Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
|/ / / / /
* | | | | Merge pull request #886 from 0xProject/fix/time-offset-accidental-revertAlex Browne2018-07-181-14/+25
|\ \ \ \ \
| * | | | | Mine a dummy block in blockchain_lifecycle to re-apply any time offsetAlex Browne2018-07-181-14/+25
|/ / / / /
* | | | | Merge pull request #881 from 0xProject/fix/timestamp-conversionsAlex Browne2018-07-1812-137/+151
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-1712-137/+151
| |/ / /
* | | | Merge pull request #875 from 0xProject/fix-order-watcherFabio Berger2018-07-1711-73/+50
|\ \ \ \
| * | | | Fix linterFabio Berger2018-07-171-1/+1
| * | | | Remove no-longer needed testsFabio Berger2018-07-171-38/+0
| * | | | Stop subscriptions from unsubscribing on recoverable network issuesFabio Berger2018-07-175-19/+29
| * | | | Merge branch 'v2-prototype' into fix-order-watcherFabio Berger2018-07-1770-10432/+10656
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Add chris to websitefragosti2018-07-172-10/+9
* | | | | Fix ocean linkBrandon Millman2018-07-171-1/+1
| |/ / / |/| | |
* | | | Merge pull request #800 from feuGeneA/patch-2Leonid Logvinov2018-07-161-4/+6
|\ \ \ \
| * | | | use bullets, not a task list, for Types of ChangesF. Eugene Aumson2018-07-021-4/+6
* | | | | Merge pull request #872 from 0xProject/dependabot/npm_and_yarn/npm-run-all-4.1.3Leonid Logvinov2018-07-161-5/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bump npm-run-all from 4.1.2 to 4.1.3dependabot[bot]2018-07-141-5/+6
* | | | | Merge pull request #876 from 0xProject/feature/website/heap-tracking-sanityFrancesco Agosti2018-07-142-5/+3
|\ \ \ \ \
| * | | | | Move update onboarding step tracking to onboarding flow codefragosti2018-07-142-5/+3
|/ / / / /
* | | | | Merge pull request #867 from 0xProject/bug/website/txhash-errorFrancesco Agosti2018-07-1416-95/+107
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-1462-10322/+10537
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #866 from 0xProject/feature/website/integrate-heapFrancesco Agosti2018-07-1421-136/+229
|\ \ \ \ \
| * | | | | Fix logging typofragosti2018-07-131-1/+1
| * | | | | Fix indentify typofragosti2018-07-132-4/+4
| * | | | | Make Analytics API non-asyncfragosti2018-07-1313-71/+44
| * | | | | Add no-floating-promises ignore commentsfragosti2018-07-1212-5/+24
| * | | | | Remove unused configs and constantsfragosti2018-07-122-2/+0
| * | | | | Integrate heap analyticsfragosti2018-07-1218-74/+122
| * | | | | Replace calls to google analytics with calls to heapfragosti2018-07-1217-98/+147
| * | | | | Add Heap snippetfragosti2018-07-111-0/+6
* | | | | | Merge pull request #874 from 0xProject/fix/request-timeout-issueFabio Berger2018-07-1445-10195/+10314
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix linterFabio Berger2018-07-141-1/+3
| * | | | | Add assertion to make sure caller to fetchAsync isn't trying to set timeout i...Fabio Berger2018-07-141-0/+3
| * | | | | Fix linter issuesFabio Berger2018-07-141-4/+3
| * | | | | Remove unused importFabio Berger2018-07-131-1/+0
| * | | | | Switch conditionalFabio Berger2018-07-131-1/+1
| * | | | | Update yarn.lock and artifactFabio Berger2018-07-132-10058/+10031
| * | | | | Merge branch 'v2-prototype' into fix/request-timeout-issueFabio Berger2018-07-136-538/+5
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix abi-gen tests to not rely on sleep, since it causes intermittent failuresFabio Berger2018-07-131-6/+7
| * | | | | Add missing assertionFabio Berger2018-07-131-0/+1
| * | | | | Move type defs to typescript-typingsdFabio Berger2018-07-134-14/+11
| * | | | | Fix linterFabio Berger2018-07-131-1/+1
| * | | | | Make createFinalPayload protectedFabio Berger2018-07-132-3/+3
| * | | | | Replace process.browser with detect-node libraryFabio Berger2018-07-133-1/+7
| * | | | | Export Web3ProviderEngine and RPCSubprovider from 0x.jsFabio Berger2018-07-132-0/+2
| * | | | | Export Web3ProviderEngine from subproviders packageFabio Berger2018-07-1321-47/+35
| * | | | | Update depsFabio Berger2018-07-133-3/+37
| * | | | | Add typedoc for json-rpc-error packageFabio Berger2018-07-131-1/+9
| * | | | | -fetch';Fabio Berger2018-07-1320-75/+45
| * | | | | Make timeout configurable on RPCSubproviderFabio Berger2018-07-131-5/+4
| * | | | | Adjust timeoutFabio Berger2018-07-131-1/+3
| * | | | | Add fetchAsync util and RPCSubproviderFabio Berger2018-07-1310-19/+154
| | | * | | Move format to helper functionfragosti2018-07-141-12/+10
| | | * | | Refactor utils and add UNNKOWN environment typefragosti2018-07-136-30/+19
| | | * | | Fix linting errorsfragosti2018-07-132-4/+2
| | | * | | Make error reporter not return a promise and add more environment possibilitiesfragosti2018-07-1314-43/+51
| | | * | | Do not crash on NaN, and provide defaultfragosti2018-07-131-2/+6
| | | * | | Only upload sourcemaps to rollbar on live deploys, and log NaN error for futu...fragosti2018-07-133-31/+43
| |_|/ / / |/| | | |
| | | | * Remove stateLayer OrderWatcher config and instead temporarily hard-code until...Fabio Berger2018-07-175-8/+13
| | | | * Remove blockRetention configFabio Berger2018-07-174-16/+1
| | | | * Pass stateLater into getBlockAsync callFabio Berger2018-07-161-1/+1
| | | | * Add PR numbersFabio Berger2018-07-141-2/+4
| | | | * Add changelog entriesFabio Berger2018-07-141-0/+7
| | | | * Update yarn.lockFabio Berger2018-07-141-3/+3
| | | | * Fix bug that make all getBlock and getLog requests go to latest blockFabio Berger2018-07-141-6/+2
| | | | * Expose Blockstreams blockRetention config as an OrderWatcher configFabio Berger2018-07-143-1/+11
| |_|_|/ |/| | |
* | | | Merge pull request #865 from 0xProject/refactor/website/remove-legacy-portalBrandon Millman2018-07-136-538/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Remove legacy portal codeBrandon Millman2018-07-126-538/+5
* | | | Merge pull request #863 from 0xProject/refactor/0x.jsFabio Berger2018-07-1227-2078/+10281
|\ \ \ \
| * | | | Add missing paramFabio Berger2018-07-121-0/+1
| * | | | remove non-existent param commentFabio Berger2018-07-121-1/+0
| * | | | Add assertions to SignatureUtils exported methodsFabio Berger2018-07-121-0/+20
| * | | | Fix prettierFabio Berger2018-07-121-1/+1
| * | | | prettier fixFabio Berger2018-07-121-10030/+10057
| * | | | Fix linter issuesFabio Berger2018-07-123-4/+6
| * | | | Rename `compact_artifacts` to `artifacts` and update themFabio Berger2018-07-128-1845/+10031
| * | | | Add PR to changelogFabio Berger2018-07-121-7/+14
| * | | | Add changelog entryFabio Berger2018-07-121-0/+29
| * | | | Refactor 0x.js to V2Fabio Berger2018-07-1214-145/+160
| * | | | Remove artifact tests since no testnet deployments are finalizedFabio Berger2018-07-121-48/+0
| * | | | Remove TokenRegistry from 0x.jsFabio Berger2018-07-126-18/+2
| * | | | Remove duplicate sol-compiler depFabio Berger2018-07-121-1/+0
| * | | | Temporarily remove OrderWatcher from 0x.jsFabio Berger2018-07-113-18/+0
| | |/ / | |/| |
* | | | Merge pull request #788 from feuGeneA/abi-gen-ignore-unchangedLeonid Logvinov2018-07-129-32/+202
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'v2-prototype' into abi-gen-ignore-unchangedLeonid Logvinov2018-07-10341-1152/+2860
| |\ \ \
| * | | | add tests of abi-genF. Eugene Aumson2018-07-096-14/+158
| * | | | move abi-gen funcs from index to utils for testingF. Eugene Aumson2018-07-092-34/+31
| * | | | using timestamps, skip gen of up-to-date wrappersF. Eugene Aumson2018-07-093-7/+35
* | | | | Merge pull request #626 from 0xProject/refactor/connect/browser-websocket-sup...Brandon Millman2018-07-1216-186/+224
|\ \ \ \ \
| * | | | | Change version to 1.0.0Brandon Millman2018-07-121-1/+1
| * | | | | Fix lint for order watcherBrandon Millman2018-07-121-1/+1
| * | | | | Fix lint for order-utilsBrandon Millman2018-07-121-1/+1
| * | | | | Lint fixesBrandon Millman2018-07-123-4/+2
| * | | | | PrettierBrandon Millman2018-07-121-1/+2
| * | | | | Provide subscriptionOpts in error callback and include url in error messagesBrandon Millman2018-07-122-6/+13
| * | | | | Remove outdated commentsBrandon Millman2018-07-121-2/+0
| * | | | | Update orderbook channel and factory testsBrandon Millman2018-07-125-24/+54
| * | | | | Update testsBrandon Millman2018-07-121-21/+15
| * | | | | Enforce one handler per channelBrandon Millman2018-07-122-49/+25
| * | | | | Add TODO comment for switching requestIds to stringsBrandon Millman2018-07-121-0/+1
| * | | | | Add explicit HACK comment when we import assertBrandon Millman2018-07-124-6/+6
| * | | | | Assert that connection is opening before attempting to subscribeBrandon Millman2018-07-121-9/+2
| * | | | | Remove unused importBrandon Millman2018-07-121-2/+2
| * | | | | Add CHANGELOG entryBrandon Millman2018-07-121-0/+8
| * | | | | Consolidate back to one channel and expose only the factoryBrandon Millman2018-07-1210-284/+65
| * | | | | Initial implementation of OrderbookChannelFactoryBrandon Millman2018-07-124-88/+113
| * | | | | Implement web browser socketBrandon Millman2018-07-1212-33/+259
|/ / / / /
* | | | | Merge pull request #840 from 0xProject/feature/migrations/forwarder-migrationsJacob Evans2018-07-117-17/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Contract Wrappers - Ether token block rangeJacob Evans2018-07-111-5/+9
| * | | | Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-114-11/+9
| * | | | Add Migrations for ForwarderJacob Evans2018-07-113-3/+19
|/ / / /
* | | | Merge pull request #848 from 0xProject/feature/contracts/safeMathAlex Browne2018-07-1128-637/+101468
|\ \ \ \
| * | | | Update artifactsAmir Bandeali2018-07-1127-634/+101453
| * | | | Add revert reasons and optimization to safeMathAmir Bandeali2018-07-111-3/+15
* | | | | Merge pull request #849 from 0xProject/feature/website/tokens-backendBrandon Millman2018-07-112-3/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Grab token registry information from our DB for mainnetBrandon Millman2018-07-112-3/+13
* | | | | Merge pull request #837 from 0xProject/fix/contracts/assetProxyOwnerVersionAmir Bandeali2018-07-117-17/+76
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-117-17/+76
|/ / / /
* | | | Merge pull request #846 from 0xProject/feature/website/add-peter-to-aboutFrancesco Agosti2018-07-112-0/+7
|\ \ \ \
| * | | | Add LinkedIn for Peterfragosti2018-07-111-0/+1
| * | | | Add Peter to about pagefragosti2018-07-102-0/+6
* | | | | Merge pull request #845 from 0xProject/bug/website/portal-soft-launch-fixesFrancesco Agosti2018-07-119-10/+84
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update rollbar for telemetryfragosti2018-07-103-2/+3
| * | | | Get rollbar uploads working by enabling sourcemapsfragosti2018-07-103-5/+9
| * | | | Fix unsubscribe bugfragosti2018-07-101-1/+3
| * | | | Use JSON stringify around GIT_SHAfragosti2018-07-101-1/+1
| * | | | Add sourcemaps for rollbarfragosti2018-07-105-3/+70
|/ / / /
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-102-0/+0
|\ \ \ \
| * | | | Delete wings.pngBrandon Millman2018-07-101-0/+0
| * | | | Delete taas.pngBrandon Millman2018-07-101-0/+0
* | | | | Change Jacobs title to Ecosystem Engineerfragosti2018-07-101-1/+1
|/ / / /
* | | | Delete qtum.pngBrandon Millman2018-07-101-0/+0
* | | | Delete eos.pngBrandon Millman2018-07-101-0/+0
* | | | Update icon file namesBrandon Millman2018-07-104-0/+0
| |/ / |/| |
* | | Merge pull request #843 from 0xProject/update-after-dev-publishFabio Berger2018-07-1081-238/+562
|\ \ \
| * | | Fix changelogsFabio Berger2018-07-106-0/+12
| * | | Remaining version fixesFabio Berger2018-07-103-22/+60
| * | | Update incorrect versionsFabio Berger2018-07-102-3/+3
| * | | Update package versionsFabio Berger2018-07-1030-208/+209
| * | | Update changelogsFabio Berger2018-07-0950-13/+286
|/ / /
* | | Add back timestampFabio Berger2018-07-091-0/+1
* | | Merge pull request #841 from 0xProject/feature/v2-contract-wrappers-validationLeonid Logvinov2018-07-099-42/+188
|\ \ \
| * | | Ignore coverage of generated filesLeonid Logvinov2018-07-091-0/+1
| * | | Dedupe AssetProxyId typesLeonid Logvinov2018-07-095-10/+3
| * | | Fix a typoLeonid Logvinov2018-07-091-1/+1
| * | | Default shouldValidate to trueLeonid Logvinov2018-07-091-17/+17
| * | | Add basic validation for exchange contract wrapperLeonid Logvinov2018-07-092-18/+159
| * | | Add type for AssetProxyIdLeonid Logvinov2018-07-091-0/+5
| * | | Add revert reason parsing to error handling decoratorLeonid Logvinov2018-07-092-0/+6
| * | | Render callAsync in templates even if it returns nothingLeonid Logvinov2018-07-091-2/+0
| * | | Return AssetProxyId instead of string from proxy.getProxyIdAsync()Leonid Logvinov2018-07-092-4/+6
|/ / /
* | | Merge pull request #833 from feuGeneA/issue-823Fabio Berger2018-07-091-0/+12
|\ \ \
| * | | document how to check test coverage on a forkF. Eugene Aumson2018-07-061-0/+12
* | | | Merge pull request #839 from 0xProject/refactor/contracts/forwarder-interfacesAmir Bandeali2018-07-0920-373/+844
|\ \ \ \
| * | | | Move functions out of Forwarder.solAmir Bandeali2018-07-0812-42/+35
| * | | | Add interfaces and mixinsAmir Bandeali2018-07-0816-61/+573
| * | | | Combine mixinsAmir Bandeali2018-07-086-284/+218
| * | | | Use interfaces instead of full contractsAmir Bandeali2018-07-084-7/+39
* | | | | Give environment enums string valuesBrandon Millman2018-07-081-2/+2
|/ / / /
* | | | Shim shouldShowPortalV2 to always return truefragosti2018-07-071-1/+3
* | | | Merge pull request #838 from 0xProject/feature/website/portal-final-touchesFrancesco Agosti2018-07-0712-107/+165
|\ \ \ \
| * | | | Fix lint errorsfragosti2018-07-071-1/+1
| * | | | Make unlock metamask step look more like mockfragosti2018-07-074-52/+81
| * | | | Add updated asset for unlock metamask portal onboarding stepfragosti2018-07-075-21/+25
| * | | | Create Balance component and make token symbols smaller than token amountsfragosti2018-07-077-38/+63
| * | | | Give Wallet a min heightfragosti2018-07-071-1/+1
* | | | | Merge pull request #826 from 0xProject/refactor/contracts/todosAmir Bandeali2018-07-0730-65/+49
|\ \ \ \ \
| * | | | | Add lint-contracts to default lint commandAmir Bandeali2018-07-071-1/+1
| * | | | | Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
| * | | | | Remove AbiV2 where unusedAmir Bandeali2018-07-0723-38/+27
| * | | | | Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
| * | | | | Change uint => uint256Amir Bandeali2018-07-071-8/+7
* | | | | | Merge pull request #835 from 0xProject/feature/website/token-updatesBrandon Millman2018-07-07149-57/+39
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update token registry icons and asset picker flowsBrandon Millman2018-07-07149-57/+39
| | |_|/ / | |/| | |
* | | | | Merge pull request #828 from 0xProject/feature/website/portal-improvementsBrandon Millman2018-07-076-8/+41
|\ \ \ \ \
| * | | | | address CR feedbackfragosti2018-07-072-3/+4