aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update chai_setup.tsLeonid2017-06-061-1/+1
* Merge branch 'master' into chai-setupLeonid2017-06-062-4/+16
|\
| * Merge pull request #38 from 0xProject/async-errorsLeonid2017-06-061-4/+6
| |\
| | * Add chai-as-promisedLeonid Logvinov2017-06-051-0/+2
| | * Add a couple of awaits and returns for async testsLeonid Logvinov2017-06-051-4/+4
| * | Merge pull request #36 from 0xProject/regression-test-transferFromLeonid2017-06-061-0/+11
| |\ \ | | |/ | |/|
| | * Address feedbackLeonid Logvinov2017-06-061-1/+2
| | * Add regression test for transferFrom bugLeonid Logvinov2017-06-051-0/+10
| |/
* | Address feedbackLeonid Logvinov2017-06-065-12/+12
* | Add chai_setupLeonid Logvinov2017-06-055-17/+22
|/
* Upgrade truffle-contract to the version that includes 'at' fixLeonid Logvinov2017-06-052-70/+183
* Merge pull request #33 from 0xProject/greenkeeper/initialLeonid2017-06-032-2/+4
|\
| * docs(readme): add Greenkeeper badgegreenkeeper[bot]2017-06-031-0/+2
| * chore(package): update dependenciesgreenkeeper[bot]2017-06-031-2/+2
* | Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-0312-573/+218
|\ \
| * | Consolidate the ExchangeContract type and flesh out type definition for isVal...Fabio Berger2017-06-031-20/+19
| * | Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| * | Be more specific with blockParam valid valuesFabio Berger2017-06-031-2/+4
| * | remove spaceFabio Berger2017-06-031-1/+1
| * | Update artifactsFabio Berger2017-06-036-566/+35
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-10/+10
| |\|
| * | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-0/+4
| |\ \
| * | | Revert unintentional artifact changesFabio Berger2017-06-036-35/+566
| * | | Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-038-150/+378
| |\ \ \
| * \ \ \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-022-4/+39
| |\ \ \ \
| * | | | | Add tests for subscribeAsync, making sure events are caught and that subscrip...Fabio Berger2017-06-021-1/+83
| * | | | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-025-6/+94
| * | | | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-025-33/+90
| |\ \ \ \ \
| * | | | | | Update artifactsFabio Berger2017-06-026-561/+30
* | | | | | | Merge pull request #29 from 0xProject/remainingTokenMethodsLeonid2017-06-036-48/+240
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-0310-18/+171
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #31 from 0xProject/unavailableFilledCancelledLeonid2017-06-038-17/+166
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-038-155/+375
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-36/+128
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| * | | | | | Simplify testsFabio Berger2017-06-021-16/+11
| * | | | | | improve commentFabio Berger2017-06-021-1/+4
| * | | | | | Add comment about the isString assertion lest the next developer tries to use...Fabio Berger2017-06-021-0/+2
| * | | | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and...Fabio Berger2017-06-023-11/+106
| * | | | | | Always wrap BigNumbers returned by web3 with our own version and add commentFabio Berger2017-06-022-5/+11
| * | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-025-44/+82
| |\ \ \ \ \ \
| * | | | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| * | | | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-024-12/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-10/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-0218-285/+984
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-015-43/+274
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa...Fabio Berger2017-06-012-0/+42
| * | | | | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHashFabio Berger2017-06-013-4/+12
* | | | | | | | | | | | Use forked version of chai-bignumber while the PR is waiting for a reviewLeonid Logvinov2017-06-032-1/+5
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| | | | | | | | | * | Fix bugFabio Berger2017-06-032-8/+6
| | | | | | | | | * | Fix commentFabio Berger2017-06-031-1/+1
| | | | | | | | | * | Add missing async suffixFabio Berger2017-06-032-2/+2
| | | | | | | | | * | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-0322-293/+1366
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Add includeStack config to chai setup so that we get stackTracesFabio Berger2017-06-034-0/+4
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #30 from 0xProject/fillOrderAsyncLeonid2017-06-0320-291/+1360
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix undefined web3 issueFabio Berger2017-06-031-2/+2
| * | | | | | | | | | Fix linter errorsLeonid Logvinov2017-06-031-4/+12
| * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-032-3/+5
| * | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-035-95/+100
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-031-8/+8
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-032-10/+10
| | * | | | | | | | | | Fix test nameLeonid Logvinov2017-06-031-1/+1
| | * | | | | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-032-6/+7
| | * | | | | | | | | | Remove spacesLeonid Logvinov2017-06-031-3/+1
| | * | | | | | | | | | Address feedbackLeonid Logvinov2017-06-033-28/+28
| | * | | | | | | | | | Allign argumentsLeonid Logvinov2017-06-031-3/+3
| | * | | | | | | | | | Rewrite commentLeonid Logvinov2017-06-031-5/+11
| | * | | | | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-033-35/+28
| | * | | | | | | | | | Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| | * | | | | | | | | | Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-023-3/+3
| | * | | | | | | | | | Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| | * | | | | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-023-3/+3
| | * | | | | | | | | | Don't pass zrxTokenAsignLeonid Logvinov2017-06-021-6/+7
| | * | | | | | | | | | Rename validation functionsLeonid Logvinov2017-06-021-8/+8
| | * | | | | | | | | | Add getZRXTokenAddressAsyncLeonid Logvinov2017-06-021-1/+4
| * | | | | | | | | | | Fix orderingFabio Berger2017-06-031-1/+1
| * | | | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-023-37/+37
| * | | | | | | | | | Improve fillOrderAsync commentFabio Berger2017-06-021-3/+6
| * | | | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-321/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove protocol token artifactsLeonid Logvinov2017-06-021-321/+0
| * | | | | | | | | | | Improve error names and remove duplicate importFabio Berger2017-06-022-8/+8
| * | | | | | | | | | | Improve commentFabio Berger2017-06-021-2/+1
| * | | | | | | | | | | remove ProtocolTokenFabio Berger2017-06-021-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Rename coinBase to coinbaseLeonid Logvinov2017-06-022-12/+12
| * | | | | | | | | | Refactor balance & allowance testsLeonid Logvinov2017-06-021-47/+42
| * | | | | | | | | | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-023-10/+96
| * | | | | | | | | | Add success test for fill with feesLeonid Logvinov2017-06-022-5/+33
| * | | | | | | | | | Add token utilsLeonid Logvinov2017-06-021-0/+23
| * | | | | | | | | | Add ProtocolTokenArtifactsLeonid Logvinov2017-06-022-1/+322
| * | | | | | | | | | Add fill scenario with feesLeonid Logvinov2017-06-022-10/+41
| * | | | | | | | | | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-024-18/+61
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Validate maker balance and allowance & testsLeonid Logvinov2017-06-022-4/+39
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-0/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add test for valid partial fillLeonid Logvinov2017-06-021-0/+17
| * | | | | | | | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ...Fabio Berger2017-06-023-6/+7
| |/ / / / / / / /
| * | | | | | | | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-022-15/+35
| * | | | | | | | Introduce coinBase accountLeonid Logvinov2017-06-024-16/+38
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fix testsLeonid Logvinov2017-06-021-2/+2
| * | | | | | | WorkLeonid Logvinov2017-06-022-15/+30
| * | | | | | | Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-025-42/+67
| * | | | | | | Change test nameLeonid Logvinov2017-06-021-3/+2
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Make validateFillOrder asyncronousLeonid Logvinov2017-06-022-3/+4
| * | | | | | Add not enough taker balance testsLeonid Logvinov2017-06-024-11/+37
| | |_|_|/ / | |/| | | |
| * | | | | Revert "Add test to check the balance"Leonid Logvinov2017-06-021-10/+0
| | |_|/ / | |/| | |
| * | | | Add test to check the balanceLeonid Logvinov2017-06-011-0/+10
| * | | | rename variableFabio Berger2017-06-011-2/+2
| * | | | Follow constants conventionLeonid Logvinov2017-06-011-2/+2
| * | | | Fix getOrderHashAsync testFabio Berger2017-06-011-0/+13
| * | | | Fix importFabio Berger2017-06-011-1/+1
| * | | | remove unused argFabio Berger2017-06-012-7/+4
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-15/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncLeonid Logvinov2017-06-011-2/+2
| | |\ \ \ \
| | * | | | | Remove duplicate declarationsLeonid Logvinov2017-06-011-15/+3
| * | | | | | Add missing comma and semi-colonFabio Berger2017-06-011-2/+2
| * | | | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ar...Fabio Berger2017-06-013-52/+64
| | |/ / / / | |/| | | |
| * | | | | move external imports to topFabio Berger2017-06-011-2/+2
| |/ / / /
| * | | | get rid of literal amount paramsFabio Berger2017-06-011-6/+16
| * | | | remove duplicate declarationsFabio Berger2017-06-011-3/+0
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-8/+18
| |\ \ \ \
| | * | | | give some balance and allowance by defaultLeonid Logvinov2017-06-011-5/+4
| | * | | | Add test, for throw when order is expiredLeonid Logvinov2017-06-011-3/+14
| * | | | | Add async suffix and fix alignmentFabio Berger2017-06-011-9/+9
| |/ / / /
| * | | | reorder variabledFabio Berger2017-06-011-3/+3
| * | | | remove legacy codeFabio Berger2017-06-011-1/+0
| * | | | reorder importFabio Berger2017-06-011-1/+1
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-9/+10
| |\ \ \ \
| | * | | | Add shouldCheckTransferLeonid Logvinov2017-06-011-1/+1
| | * | | | Refactor testsLeonid Logvinov2017-06-011-10/+11
| * | | | | put external imports at the topFabio Berger2017-06-011-6/+6
| * | | | | remove commentFabio Berger2017-06-011-1/+0
| |/ / / /
| * | | | rename txData to txOptsFabio Berger2017-06-011-2/+2
| * | | | remove superfluous paramFabio Berger2017-06-011-1/+1
| * | | | remove unused argFabio Berger2017-06-011-2/+1
| * | | | remove unneeded methodFabio Berger2017-06-011-5/+1
| * | | | improve commentFabio Berger2017-06-011-2/+2
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-014-4/+12
| |\ \ \ \
| | * | | | Add timestamp parameter to order factoryLeonid Logvinov2017-06-011-3/+7
| | * | | | Add expired checkLeonid Logvinov2017-06-011-0/+3
| | * | | | Add EXPIRED error typeLeonid Logvinov2017-06-011-0/+1
| | * | | | Increase mocha timeoutLeonid Logvinov2017-06-011-1/+1
| * | | | | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn...Fabio Berger2017-06-012-9/+15
| |/ / / /
| * | | | Revert "Add EXPIRED test"Leonid Logvinov2017-06-015-34/+20
| * | | | Get getSenderAddressOrThrowAsync everywhere where we throw if the senderAddre...Fabio Berger2017-06-012-15/+12
| * | | | Add ExchangeContractErrs string enumFabio Berger2017-06-012-8/+17
| * | | | fix formattingFabio Berger2017-06-011-4/+2
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-016-28/+63
| |\ \ \ \
| | * | | | Add EXPIRED testLeonid Logvinov2017-06-015-21/+35
| | * | | | Fix testsLeonid Logvinov2017-06-011-8/+2
| | * | | | Add NOT_A_TAKER checkLeonid Logvinov2017-06-013-1/+14
| | * | | | Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-013-2/+16
| * | | | | Rename ExchangeContractErrs to ExchangeContractErrCodesFabio Berger2017-06-012-10/+10
| |/ / / /
| * | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.jsFabio Berger2017-06-014-7/+6
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-012-9/+7
| |\ \ \ \
| | * | | | Add taker parameter to createSignedOrderLeonid Logvinov2017-06-012-3/+6
| | * | | | Rename order to order_factoryLeonid Logvinov2017-06-012-1/+1
| | * | | | Remove unnecessary checksLeonid Logvinov2017-06-011-5/+0
| * | | | | rename signed_order_schema to order_schemasFabio Berger2017-06-014-3/+3
| |/ / / /
| * | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-014-46/+365
| |\ \ \ \
| | * | | | Fix types hell with, chai and chai-as-promisedLeonid Logvinov2017-06-014-46/+365
| * | | | | Add convertToJSONSchemaCompatibleObject methodFabio Berger2017-06-013-2/+15
| * | | | | move external imports to topFabio Berger2017-06-011-2/+2
| |/ / / /
| * | | | make bigNumberConfig a moduleFabio Berger2017-06-012-9/+13
| * | | | Fix linter errorsLeonid Logvinov2017-06-013-22/+28
| * | | | Add dirty-chaiLeonid Logvinov2017-06-014-26/+16
| * | | | Type estimateGasLeonid Logvinov2017-06-011-4/+6
| * | | | Allign parametersLeonid Logvinov2017-06-011-2/+2
| * | | | Remove TxDataLeonid Logvinov2017-06-011-5/+1
| * | | | Temporarily fix gas extimationLeonid Logvinov2017-06-011-0/+13
| * | | | Use constLeonid Logvinov2017-06-011-1/+1
| * | | | Add setDefaultAccountLeonid Logvinov2017-06-013-2/+12
| * | | | Temp pushLeonid Logvinov2017-06-012-55/+58
| * | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-015-43/+4064
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Add setAllowance functionLeonid Logvinov2017-05-311-4/+18
| * | | | Fix linter errorsLeonid Logvinov2017-05-314-5/+5
| * | | | Remove debug outputLeonid Logvinov2017-05-311-3/+0
| * | | | Revert testsLeonid Logvinov2017-05-311-7/+43
| * | | | Add createSignedOrder functionLeonid Logvinov2017-05-311-6/+23
| * | | | Don't return contract responseLeonid Logvinov2017-05-311-2/+1
| * | | | Set bignumber configLeonid Logvinov2017-05-312-0/+11
| * | | | Fix linter commandLeonid Logvinov2017-05-311-1/+1
| * | | | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-316-2/+242
| |\ \ \ \
| * | | | | Refactor getOrderHash to accept order as an objectLeonid Logvinov2017-05-305-78/+61
| * | | | | Remove spaces in typesLeonid Logvinov2017-05-301-4/+0
| * | | | | Remove fixtureLeonid Logvinov2017-05-301-35/+0
| * | | | | Add first passing testLeonid Logvinov2017-05-301-4/+5
| * | | | | Add isBigNumber argument assertionLeonid Logvinov2017-05-301-0/+1
| * | | | | replace test fixture with the one from testrpcLeonid Logvinov2017-05-302-35/+35
| * | | | | Fix importLeonid Logvinov2017-05-301-1/+1
| * | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-3010-13/+191
| |\ \ \ \ \
| * | | | | | Temporarily remove testLeonid Logvinov2017-05-301-2/+1
| * | | | | | Add throwErrorLogsAsErrorsLeonid Logvinov2017-05-301-6/+10
| * | | | | | Append _test to exchange_wrapperLeonid Logvinov2017-05-301-1/+11
| * | | | | | Add order utilsLeonid Logvinov2017-05-301-0/+21
| * | | | | | Fix order typeLeonid Logvinov2017-05-301-1/+0
| * | | | | | Fix orderSchemaLeonid Logvinov2017-05-301-4/+4
| * | | | | | Add fillAmount parameterLeonid Logvinov2017-05-301-2/+3
| * | | | | | Add copy_fixtures commandLeonid Logvinov2017-05-301-2/+3
| * | | | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of paramsLeonid Logvinov2017-05-301-35/+21
| * | | | | | Change BigNumber schema to Number schemaLeonid Logvinov2017-05-301-2/+2
| * | | | | | Change BigNumber schema to Number schemaLeonid Logvinov2017-05-301-11/+10
| * | | | | | Add id to signedOrderSchemaLeonid Logvinov2017-05-301-0/+1
| * | | | | | Add first order fixtureLeonid Logvinov2017-05-301-0/+35
| * | | | | | Add isBoolean assertionLeonid Logvinov2017-05-301-0/+3
| * | | | | | Add signedOrderSchema and all subschemasLeonid Logvinov2017-05-302-1/+56
| * | | | | | Add Order and SignedOrder typesLeonid Logvinov2017-05-301-0/+23
| * | | | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-303-2/+3
| |\ \ \ \ \ \
| * | | | | | | Finish ecSignature renamingLeonid Logvinov2017-05-302-4/+4
| * | | | | | | Add assertions for parametersLeonid Logvinov2017-05-301-1/+15
| * | | | | | | Move field declaration to the begining of the classLeonid Logvinov2017-05-301-8/+8
| * | | | | | | Add initial implementation of fillOrderAsyncLeonid Logvinov2017-05-302-1/+96
| * | | | | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsyncLeonid Logvinov2017-05-302-6/+14
| * | | | | | | Add tests to linter targetsLeonid Logvinov2017-05-301-1/+1
| * | | | | | | Use npm run testrpc on circlecCILeonid Logvinov2017-05-301-1/+1
| | | | | | | * remove unneeded calls to toBaseUnitAmountFabio Berger2017-06-021-8/+4
| | | | | | | * pass numbers to BigNumber unless it's too big for the number typeFabio Berger2017-06-021-4/+4
| | | | | | | * use BigNumber(0) instead of with a string zeroFabio Berger2017-06-021-4/+4
| | | | | | | * Add balance check to `transferAsync` and related testFabio Berger2017-06-022-3/+20
| | | | | | | * Improve commentFabio Berger2017-06-021-0/+2
| | | | | | | * Add tests for transferFromAsync, setAllowanceAsync and getAllowanceAsync and ...Fabio Berger2017-06-021-21/+125
| | | | | | | * Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapperFabio Berger2017-06-025-18/+93
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix tslint issuesFabio Berger2017-06-021-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #28 from 0xProject/erc20transferLeonid2017-06-013-23/+60
|\ \ \ \ \ \
| * | | | | | Address feedbackLeonid Logvinov2017-05-311-26/+28
| * | | | | | Merge branch 'master' into erc20transferLeonid2017-05-313-15/+3840
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Add transfer function and tests for itLeonid Logvinov2017-05-313-1/+36
* | | | | | Fix testrpc verison to 3.0.5Leonid Logvinov2017-06-012-20/+214
| |/ / / / |/| | | |
* | | | | Merge pull request #26 from 0xProject/erc20WrapperFabio Berger2017-05-316-2/+206
|\ \ \ \ \
| * | | | | Add TxOpts typeFabio Berger2017-05-311-1/+6
| * | | | | remove InternalError type since this error could surface through the public i...Fabio Berger2017-05-312-7/+3
| * | | | | Remove superfluous undefined checkFabio Berger2017-05-311-4/+2
| * | | | | Add full stop to commentsFabio Berger2017-05-311-2/+2
| |/ / / /
| * | | | remove unused importsFabio Berger2017-05-302-4/+0
| * | | | Add test for setProxyAllowanceAsync and additional test for getProxyAllowance...Fabio Berger2017-05-301-2/+32
| * | | | Implement setProxyAllowanceAsyncFabio Berger2017-05-303-4/+34
| * | | | remove spaces after it keywordFabio Berger2017-05-301-2/+2
| * | | | Add first test for getProxyAllowanceAsyncFabio Berger2017-05-301-0/+9
| * | | | Implement zeroEx.token.getProxyAllowanceAsyncFabio Berger2017-05-302-1/+34
| * | | | use token instead of erc20Fabio Berger2017-05-302-6/+6
| * | | | rename ERC20Contract to TokenContractFabio Berger2017-05-302-5/+5
| * | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up supp...Fabio Berger2017-05-303-8/+31
| * | | | Merge branch 'master' into erc20WrapperFabio Berger2017-05-308-23/+85
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'tokenRegistry' into erc20WrapperFabio Berger2017-05-302-1/+1
| |\ \ \ \
| * | | | | Add tests for getBalanceAsyncFabio Berger2017-05-301-0/+55
| * | | | | Implement ERC20Wrapper and it's first method getBalanceAsyncFabio Berger2017-05-303-0/+37
* | | | | | Merge pull request #27 from 0xProject/yarnFabio Berger2017-05-311-0/+3826
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add yarn.lockLeonid Logvinov2017-05-311-0/+3826
|/ / / / /
* | | | | Remove mention of internal cleanup from public commentFabio Berger2017-05-301-2/+1
* | | | | Merge pull request #25 from 0xProject/dontReinstantiateContractInstancesLeonid2017-05-307-9/+74
|\ \ \ \ \
| * | | | | use .be.undefined instead of .be.an('undefined')Fabio Berger2017-05-301-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:35:59 +0800