Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -0/+1 |
|\ | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | ||||
| * | Fix types hell with, chai and chai-as-promised | Leonid Logvinov | 2017-06-01 | 1 | -4/+0 |
| | | |||||
| * | Fix linter errors | Leonid Logvinov | 2017-06-01 | 1 | -0/+4 |
| | | |||||
| * | Add dirty-chai | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | | |||||
* | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper | Fabio Berger | 2017-06-02 | 1 | -0/+6 |
|/ | |||||
* | Merge branch 'master' into addSignOrderHashAndTests | Fabio Berger | 2017-05-29 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | # Conflicts: # package.json # src/globals.d.ts # test/0x.js_test.ts | ||||
| * | Address feedback | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 |
| | | |||||
| * | Make eventually a PromisedAssertion | Leonid Logvinov | 2017-05-29 | 1 | -1/+2 |
| | | |||||
* | | fix declaration | Fabio Berger | 2017-05-29 | 1 | -1/+1 |
| | | |||||
* | | Add declarations for find-versions and compare-versions | Fabio Berger | 2017-05-29 | 1 | -2/+12 |
| | | |||||
* | | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 1 | -0/+3 |
|/ | |||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 1 | -0/+63 |