aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | | | Make wallet height responsivefragosti2018-07-061-1/+1
| * | | | Poll for gas prices and use fast instead of average for better UXfragosti2018-07-062-4/+29
| * | | | Just disable closing onboarding by clicking outside for firefoxfragosti2018-07-061-3/+1
| * | | | Use default networkId of 1 for ledger dropdownfragosti2018-07-061-1/+4
| * | | | Fix onboarding closing on unlock metamask step on click outsidefragosti2018-07-062-2/+8
* | | | | Hard code exchange abiBrandon Millman2018-07-072-1/+616
| |_|/ / |/| | |
* | | | Merge pull request #829 from 0xProject/bug/web3-wrapper/fix-invalid-transacti...Francesco Agosti2018-07-074-2/+26
|\ \ \ \
| * | | | Fix linting issuesfragosti2018-07-071-1/+1
| * | | | Export marshaller and use it to unmarshal tx dataafragosti2018-07-073-2/+13
| * | | | Revert moving formatUtils into utilsfragosti2018-07-077-59/+43
| * | | | Add formatUtilsfragosti2018-07-061-0/+61
| * | | | Add to changelog, rename to formatUtils and lintfragosti2018-07-065-94/+41
| * | | | Add conversion utility filefragosti2018-07-061-0/+59
| * | | | Unmarshall txn data in SignerSubprovider before calling web3wrapper sendTrans...fragosti2018-07-066-97/+46
| * | | | Add unmarshallTxData to marshallerfragosti2018-07-061-0/+13
* | | | | Merge pull request #834 from 0xProject/fix/contracts/linterAmir Bandeali2018-07-0775-309/+364
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Apply new linter rulesAmir Bandeali2018-07-0774-299/+351
| * | | | Update linter configAmir Bandeali2018-07-072-11/+14
|/ / / /
* | | | Instantiate BlockAndLogStreamer with generic type parametersLeonid Logvinov2018-07-061-1/+1
* | | | Merge pull request #831 from 0xProject/fix-readme-introsFabio Berger2018-07-064-16/+17
|\ \ \ \
| * | | | Update readme and doc introsFabio Berger2018-07-064-16/+17
| | |/ / | |/| |
* | | | Merge pull request #825 from 0xProject/fix-order-watcherFabio Berger2018-07-067-181/+96
|\ \ \ \
| * | | | Add isVerbose flag and log blockstream recoverable errors rather then bubblin...Fabio Berger2018-07-063-10/+17
| * | | | properly stop blockstream and pass stateLayer into blockstreamFabio Berger2018-07-061-6/+19
| * | | | Add pr numberFabio Berger2018-07-061-2/+4
| * | | | Add changelog notesFabio Berger2018-07-061-1/+4
| * | | | Don't unsubscribe on Blockstream errorsFabio Berger2018-07-062-6/+1
| * | | | Pass actual networkIdFabio Berger2018-07-061-6/+5
| * | | | Remove legacy logicFabio Berger2018-07-051-35/+0
| * | | | Refactor order-watcher to use Blockstream under-the-hoodFabio Berger2018-07-053-173/+104
* | | | | Fix importsLeonid Logvinov2018-07-061-2/+2
* | | | | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIPLeonid Logvinov2018-07-06120-5720/+12137
|\ \ \ \ \
| * | | | | Fix testsLeonid Logvinov2018-07-067-38/+28
| * | | | | Fix prettierLeonid Logvinov2018-07-051-1/+2
| * | | | | Fix merge conflictsLeonid Logvinov2018-07-052-11/+3
| * | | | | Add CHANGELOG entriesLeonid Logvinov2018-07-052-1/+18
| * | | | | Upgrade artifactsLeonid Logvinov2018-07-052-8/+183
| * | | | | Merge branch 'v2-prototype' into v2-contract-wrappers-WIPLeonid Logvinov2018-07-0513-92/+575
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #814 from 0xProject/feature/fill-scenarios-v2Leonid Logvinov2018-07-0568-1427/+7306
| |\ \ \ \ \ \
| | * | | | | | Adjust commentsLeonid Logvinov2018-07-052-121/+81
| | * | | | | | Fix commentsLeonid Logvinov2018-07-051-5/+5
| | * | | | | | Improve the commentLeonid Logvinov2018-07-051-1/+1
| | * | | | | | Rename Proxie to ProxyLeonid Logvinov2018-07-052-5/+3
| | * | | | | | Rename compact_artifacts to artifactsLeonid Logvinov2018-07-0511-12/+12
| | * | | | | | Rearrange assertions t match parameter orderLeonid Logvinov2018-07-054-145/+118
| | * | | | | | Fix match orders test and add a validation TODOLeonid Logvinov2018-07-052-3/+12
| | * | | | | | Add tests for exchange contract wrapperLeonid Logvinov2018-07-051-1029/+313
| | * | | | | | Add Exchange contract wrapperLeonid Logvinov2018-07-053-3/+1040
| | * | | | | | Pass through blockPollingInterval down to contract wrapperLeonid Logvinov2018-07-053-6/+21
| | * | | | | | Export orderStatus and OrderInfoLeonid Logvinov2018-07-051-0/+2
| | * | | | | | Add blockPollingInterval config to contractWrappers config typeLeonid Logvinov2018-07-051-0/+2
| | * | | | | | Add contractWrappers.erc721Proxy.getproxyIdAsyncLeonid Logvinov2018-07-051-0/+9
| | * | | | | | Add contractWrappers.erc20Proxy.getproxyIdAsyncLeonid Logvinov2018-07-051-0/+9
| | * | | | | | Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-0523-237/+247
| | * | | | | | Add blockPollingIntervalMs as an optional field to contract-wrappers config s...Leonid Logvinov2018-07-052-0/+2
| | * | | | | | Add even more entries to postinstall hackLeonid Logvinov2018-07-051-2/+2
| | * | | | | | Update dummy tokens addresses in token_utilsLeonid Logvinov2018-07-051-3/+3
| | * | | | | | Remove only from testsLeonid Logvinov2018-07-051-1/+1
| | * | | | | | Add OrderInfo and OrderStatus to typesLeonid Logvinov2018-07-051-0/+16
| | * | | | | | Add OrderTxOptsSchemaLeonid Logvinov2018-07-051-0/+8
| | * | | | | | Refactor fill-scenarios for V2Leonid Logvinov2018-07-053-49/+16
| | * | | | | | Export ecSignatureParameterSchema from json-schemasLeonid Logvinov2018-07-051-1/+2
| | * | | | | | Add ordersSchema to json-schemasLeonid Logvinov2018-07-052-0/+7
| | * | | | | | Fix VRS signature generation in order-utilsLeonid Logvinov2018-07-051-2/+3
| | * | | | | | Update ABI in compact_artifactsLeonid Logvinov2018-07-053-86/+585
| | * | | | | | Upgrade artifactsLeonid Logvinov2018-07-0516-1/+5071
| | * | | | | | Dump assert version and make the order-watcher depend on the old assert versionLeonid Logvinov2018-07-051-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'v2-prototype' into v2-contract-wrappers-WIPLeonid Logvinov2018-07-05278-2774/+8486
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Revert all changes to the contractsLeonid Logvinov2018-07-0514-360/+64
| * | | | | | Merge pull request #782 from 0xProject/feature/contract-wrappers-v2Leonid Logvinov2018-07-03113-11290/+6659
| |\ \ \ \ \ \
| | * | | | | | Fix build after rebaseLeonid Logvinov2018-06-292-3/+3
| | * | | | | | Add a commentLeonid Logvinov2018-06-291-0/+2
| | * | | | | | Assign true values to names varsLeonid Logvinov2018-06-291-8/+13
| | * | | | | | Fix a typoLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Set the interval to 0 in awaitTranscationSuccessAsyncLeonid Logvinov2018-06-2910-34/+76
| | * | | | | | Make promises dangerousLeonid Logvinov2018-06-293-3/+0
| | * | | | | | Add a TODO commentLeonid Logvinov2018-06-291-0/+1
| | * | | | | | Add isSubscriptionToken assertionLeonid Logvinov2018-06-294-0/+8
| | * | | | | | Rename approved to approvedAddressLeonid Logvinov2018-06-291-2/+2
| | * | | | | | Use removeUndefinedProperties for txOptsLeonid Logvinov2018-06-293-32/+55
| | * | | | | | Rename getApprovedAsync to getApprovedIfExistsAsyncLeonid Logvinov2018-06-292-8/+11
| | * | | | | | Add HACK commentsLeonid Logvinov2018-06-294-0/+8
| | * | | | | | Add assertions for txOpts and methodOptsLeonid Logvinov2018-06-294-38/+75
| | * | | | | | Remove v2 artifact scriptsLeonid Logvinov2018-06-291-4/+1
| | * | | | | | Remove tokenTransferProxyAddress from configLeonid Logvinov2018-06-292-10/+6
| | * | | | | | Add a hack commentLeonid Logvinov2018-06-291-0/+2
| | * | | | | | Fix a typoLeonid Logvinov2018-06-292-2/+2
| | * | | | | | Fix linter errorsLeonid Logvinov2018-06-291-2/+0
| | * | | | | | Fix addresses in WETH9 and ZRX token artifactsLeonid Logvinov2018-06-292-2/+2
| | * | | | | | Fix the token supply in migrationsLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Dump assert version and make the order-watcher depend on the old assert versionLeonid Logvinov2018-06-298-10/+20
| | * | | | | | Change event args names after templates changeLeonid Logvinov2018-06-291-16/+16
| | * | | | | | Add contract-wrappers -> json-schemas and order-utils to postinstall hackLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Change import paths from z_r_x and e_r_c to zrx and erc in migrationsLeonid Logvinov2018-06-292-5/+5
| | * | | | | | Regenerate yarn.lockLeonid Logvinov2018-06-291-9/+29
| | * | | | | | Export newly refactored contracts from contract-wrappers and index.tsLeonid Logvinov2018-06-292-70/+50
| | * | | | | | Change artifacts list and add dependencies to package.jsonLeonid Logvinov2018-06-291-6/+6
| | * | | | | | Bump the version so that order-watcher doesn't pick it upLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Refactor event subscription testsLeonid Logvinov2018-06-291-13/+27
| | * | | | | | Refactor typesLeonid Logvinov2018-06-291-35/+21
| | * | | | | | Implement ERC721 token wrapper and token transfer proxy with testsLeonid Logvinov2018-06-294-0/+1008
| | * | | | | | Refactor ERC20 token transfer proxy and it's testsLeonid Logvinov2018-06-292-29/+27
| | * | | | | | Refactor ERC20 token wrapper and it's testsLeonid Logvinov2018-06-292-151/+208
| | * | | | | | Refactor ether token wrapper testLeonid Logvinov2018-06-291-53/+64
| | * | | | | | Refactor base contract-wrapper class to use new names, artifact format and on...Leonid Logvinov2018-06-291-21/+13
| | * | | | | | Refactor EtherToken contract wrapper to use new names and artifacts formatLeonid Logvinov2018-06-291-19/+19
| | * | | | | | Use new signature verification method in assertionsLeonid Logvinov2018-06-291-9/+12
| | * | | | | | Export txDefaults from web3_wrapper.tsLeonid Logvinov2018-06-291-3/+7
| | * | | | | | Refactor tokenUtils to not use tokenRegistryLeonid Logvinov2018-06-291-30/+42
| | * | | | | | Add new test constantsLeonid Logvinov2018-06-291-0/+8
| | * | | | | | Skip & refactor artifacts testsLeonid Logvinov2018-06-291-15/+9
| | * | | | | | Run V2 migrations instead of V1 before testsLeonid Logvinov2018-06-291-3/+3
| | * | | | | | Remove unused params in filter_utilsLeonid Logvinov2018-06-291-13/+3
| | * | | | | | Start unused parameter names with underscoreLeonid Logvinov2018-06-291-4/+4
| | * | | | | | Remove old contracts and add new ones to/from artifacts.tsLeonid Logvinov2018-06-291-14/+19
| | * | | | | | Remove exchange-related functionality for nowLeonid Logvinov2018-06-2912-3691/+0
| | * | | | | | Update compact_wrtifactsLeonid Logvinov2018-06-2914-1820/+3311
| | * | | | | | Change import paths from z_r_x and e_r_c to zrx and erc. Also rename event ar...Leonid Logvinov2018-06-2912-61/+359
| | * | | | | | Change import paths from z_r_x and e_r_c to zrx and ercLeonid Logvinov2018-06-291-2/+2
| | * | | | | | Rename TransferContractEventArgs to MetacoinTransferEventArgs after changing ...Leonid Logvinov2018-06-291-4/+4
| | * | | | | | Change import paths from z_r_x and e_r_c to zrx and ercLeonid Logvinov2018-06-292-4/+4
| | * | | | | | Pin contract-wrappers versionLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Remove unused code/variables from abi-decoderLeonid Logvinov2018-06-291-2/+0
| | * | | | | | Rename {{*}}ContractEventArgs to {{*}}EventArgs and append {{contractName}} t...Leonid Logvinov2018-06-292-3/+3
| | * | | | | | Update json-schema version to 1.0.0Leonid Logvinov2018-06-291-1/+1
| | * | | | | | Add to postinstall hack: rm fill-scenarios/node_modules/@0xprojectLeonid Logvinov2018-06-291-1/+1
| | * | | | | | Remove generated contract directory before writing new contracts and replace ...Leonid Logvinov2018-06-292-3/+5
* | | | | | | | Types: Move Forwarder Revert Reason into types packageJacob Evans2018-07-063-13/+13
* | | | | | | | Forwarder specify the revert reasonsJacob Evans2018-07-061-21/+31
* | | | | | | | Forwarder fix linter errorJacob Evans2018-07-061-1/+1
* | | | | | | | Update to new assertionsJacob Evans2018-07-061-18/+16
* | | | | | | | Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-0624-99/+3177
|\ \ \ \ \ \ \ \
| * | | | | | | | Forwarding contract (squashed commits)Jacob Evans2018-07-0625-115/+3193
* | | | | | | | | Merge pull request #827 from 0xProject/feature/website/landing-page-ctaBrandon Millman2018-07-069-48/+54
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Change call to action link to /portalBrandon Millman2018-07-061-6/+2
| * | | | | | | | Unify large and small padding in PortalBrandon Millman2018-07-061-13/+6
| * | | | | | | | Implement landing page change in preperation for portalBrandon Millman2018-07-069-29/+46
* | | | | | | | | Merge pull request #824 from protofire/v2-prototype-solhintAmir Bandeali2018-07-0663-10/+334
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0660-1/+78
| * | | | | | | | Added Solhint package and 'lint-contracts' npm scriptAlex Shafranovich2018-07-063-9/+256
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #820 from 0xProject/bug/website/top-bar-layoutBrandon Millman2018-07-064-42/+71
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Various fixes for portal on mobile and top bar layoutBrandon Millman2018-07-064-42/+71
|/ / / / / / /
* | | | | | | Merge pull request #816 from 0xProject/feature/website/portal-mobile-improvem...Francesco Agosti2018-07-0611-49/+134
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename getBestDownloadLink to getBestWalletDownloadLinkAndIsMobilefragosti2018-07-063-3/+3
| * | | | | | No longer elevate relayer grid tile on long pressfragosti2018-07-042-3/+4
| * | | | | | Fix issue where onboarding doesn't scroll to wallet when starting from relaye...fragosti2018-07-042-6/+5
| * | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-07-0443-468/+622
| |\ \ \ \ \ \
| * | | | | | | Add toshi logo assetfragosti2018-07-041-0/+0
| * | | | | | | Prompt user to download Toshi or MetaMask in install wallet onboarding stepfragosti2018-07-043-46/+73
| * | | | | | | Show different download links and icons when on mobilefragosti2018-07-043-20/+47
| * | | | | | | Rename isMobile utility fn to be more specific and add isMobileOperatingSystemfragosti2018-07-043-5/+8
| * | | | | | | Add OperatingSystemType and get OS utilfragosti2018-07-042-0/+28
* | | | | | | | Merge pull request #821 from 0xProject/remove-web3-from-wrapperFabio Berger2018-07-0513-92/+575
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Prettier fixesFabio Berger2018-07-052-5/+18
| * | | | | | | Update json-schema version used by web3-wrapperFabio Berger2018-07-052-11/+2
| * | | | | | | Add schema assertion checks for callData and txDataFabio Berger2018-07-051-3/+4
| * | | | | | | Make sure from is included in txDataFabio Berger2018-07-051-0/+3
| * | | | | | | Add CallData schema to json-schemasFabio Berger2018-07-053-0/+33
| * | | | | | | Update assert changelogFabio Berger2018-07-051-0/+9
| * | | | | | | Add defaultBlock param to getBalanceInWeiAsyncFabio Berger2018-07-051-2/+7
| * | | | | | | Move 'from' check to sendTransactionFabio Berger2018-07-052-3/+3
| * | | | | | | Remove bn.js unused depFabio Berger2018-07-051-1/+0
| * | | | | | | Fix linter issuesFabio Berger2018-07-053-11/+4
| * | | | | | | remove stray console.logFabio Berger2018-07-051-1/+0
| * | | | | | | Remove web3Utils dep and write necessary utility methodsFabio Berger2018-07-056-79/+93
| * | | | | | | Add new param javadoc commentFabio Berger2018-07-051-0/+1
| * | | | | | | merge v2-prototypeFabio Berger2018-07-05113-796/+1396
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #817 from 0xProject/remove-web3Fabio Berger2018-07-0516-62/+92
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge v2-prototypeFabio Berger2018-07-0455-307/+851
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #775 from RadarRelay/eth-lightwallet-subprovider-finalJacob Evans2018-07-0420-39/+435
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into eth-lightwallet-subprovider-finalJacob Evans2018-07-0454-542/+687
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #818 from 0xProject/fix-intermittent-test-failureFabio Berger2018-07-042-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Use stub in test to avoid difference in setup, how network requests take placeFabio Berger2018-07-042-0/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #811 from 0xProject/feature/website/onboarding-polish-2Francesco Agosti2018-07-0410-48/+111
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Persist whether onboarding is open or close across refreshesfragosti2018-07-041-1/+3
| * | | | | | | | | Fix lintingfragosti2018-07-042-3/+2
| * | | | | | | | | Merge branch 'fixed-position-onboarding' into feature/website/onboarding-poli...fragosti2018-07-042-33/+67
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Implement fixed position onboarding optionfragosti2018-07-032-33/+67
| * | | | | | | | | | Remove unused importfragosti2018-07-031-1/+0
| * | | | | | | | | | Add end comment to hotjar tracking codefragosti2018-07-031-0/+1
| * | | | | | | | | | Add media file and remove stray commentfragosti2018-07-032-2/+15
| |/ / / / / / / / /