Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix unit test | Fabio Berger | 2017-12-07 | 1 | -1/+1 |
| | |||||
* | Fix ethereumjs-tx declaration and import | Fabio Berger | 2017-12-07 | 2 | -2/+2 |
| | |||||
* | Use assert.isHexString | Fabio Berger | 2017-12-07 | 2 | -5/+3 |
| | |||||
* | Add type defs for ledgerco and ethereumjs-tx | Fabio Berger | 2017-12-07 | 2 | -13/+37 |
| | |||||
* | Make test only run unit tests since cannot run integration tests on CI | Fabio Berger | 2017-12-07 | 1 | -3/+4 |
| | |||||
* | Improve README | Fabio Berger | 2017-12-07 | 1 | -1/+1 |
| | |||||
* | Fix version and remove the UMD build | Fabio Berger | 2017-12-07 | 3 | -66/+4 |
| | |||||
* | Fix tslint error | Fabio Berger | 2017-12-07 | 1 | -1/+1 |
| | |||||
* | Standardize deps | Fabio Berger | 2017-12-07 | 3 | -9/+13 |
| | |||||
* | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-07 | 15 | -122/+164 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Inline function Introduce a const Make private Add version matcher script Use same versions of dependencies everywhere Add missing await Move declaration into proper conditional block Fix Party element so that an identicon's height is that which was passed in # Conflicts: # packages/website/package.json # yarn.lock | ||||
| * | Merge pull request #250 from 0xProject/feature/airport-experiments | Leonid | 2017-12-06 | 12 | -128/+165 |
| |\ | | | | | | | Compare versions script | ||||
| | * | Merge branch 'development' into feature/airport-experiments | Leonid | 2017-12-06 | 17 | -57/+104 |
| | |\ | | |/ | |/| | |||||
| * | | Add missing await | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | Move declaration into proper conditional block | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Party element so that an identicon's height is that which was passed in | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| | * | Inline function | Leonid Logvinov | 2017-12-06 | 1 | -6/+1 |
| | | | |||||
| | * | Introduce a const | Leonid Logvinov | 2017-12-06 | 1 | -1/+3 |
| | | | |||||
| | * | Make private | Leonid Logvinov | 2017-12-06 | 1 | -0/+1 |
| | | | |||||
| | * | Add version matcher script | Leonid Logvinov | 2017-12-06 | 4 | -0/+110 |
| | | | |||||
| | * | Use same versions of dependencies everywhere | Leonid Logvinov | 2017-12-06 | 8 | -129/+57 |
| | | | |||||
* | | | Have comments hug statements | Fabio Berger | 2017-12-06 | 1 | -3/+3 |
| | | | |||||
* | | | Add declaration | Fabio Berger | 2017-12-06 | 1 | -0/+7 |
| | | | |||||
* | | | Return actual error thrown | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | remove unused modules | Fabio Berger | 2017-12-06 | 2 | -5/+0 |
| | | | |||||
* | | | Use subproviders subpackage in website and remove old subproviders | Fabio Berger | 2017-12-06 | 7 | -300/+45 |
| | | | |||||
* | | | remove extra space | Fabio Berger | 2017-12-06 | 1 | -1/+0 |
| | | | |||||
* | | | Add initial tests fort redundantRpcSubprovider | Fabio Berger | 2017-12-06 | 1 | -0/+62 |
| | | | |||||
* | | | Add null to err type | Fabio Berger | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
* | | | Use null instead of undefined when no error exists | Fabio Berger | 2017-12-06 | 1 | -3/+3 |
| | | | |||||
* | | | Switch to using our custom base subprovider | Fabio Berger | 2017-12-06 | 1 | -1/+2 |
| | | | |||||
* | | | remove unused import | Fabio Berger | 2017-12-06 | 1 | -1/+0 |
| | | | |||||
* | | | Fix lint issues | Fabio Berger | 2017-12-06 | 3 | -9/+11 |
| | | | |||||
* | | | Merge branch 'development' into feature/addSubproviders | Fabio Berger | 2017-12-06 | 155 | -302/+17404 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (50 commits) Add PR number to changelog Address feedback Add requestId to subscription messages and update json-schemas Remove isomorphic-fetch types from contracts package Update README Regenerate files Make it private Change package name Update README Make fileExtension configurable Rename abi-gen to typed-contracts Add docs for typed-contracts Remove TODOs Introduce separate ContextData type and rework it Check ABI is defined Introduce a const for 'contract.mustache' Improve error message Reuse util Fix a typo Introduce a const for 'function' ... # Conflicts: # yarn.lock | ||||
| * | | Merge pull request #251 from 0xProject/feature/websocketVersion2 | Brandon Millman | 2017-12-06 | 13 | -50/+101 |
| |\ \ | | | | | | | | | Add requestId to subscription messages and update json-schemas | ||||
| | * | | Add PR number to changelog | Brandon Millman | 2017-12-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add requestId to subscription messages and update json-schemas | Brandon Millman | 2017-12-06 | 13 | -50/+101 |
| | | | | |||||
| * | | | Merge pull request #249 from 0xProject/feature/typed-contracts | Leonid | 2017-12-06 | 38 | -305/+2758 |
| |\ \ \ | | |/ / | |/| / | | |/ | ABI to TS generator | ||||
| | * | Address feedback | Leonid Logvinov | 2017-12-06 | 3 | -10/+10 |
| | | | |||||
| | * | Update README | Leonid Logvinov | 2017-12-06 | 1 | -5/+6 |
| | | | |||||
| | * | Regenerate files | Leonid Logvinov | 2017-12-06 | 5 | -5/+5 |
| | | | |||||
| | * | Make it private | Leonid Logvinov | 2017-12-06 | 1 | -0/+1 |
| | | | |||||
| | * | Change package name | Leonid Logvinov | 2017-12-06 | 1 | -1/+1 |
| | | | |||||
| | * | Update README | Leonid Logvinov | 2017-12-06 | 1 | -2/+3 |
| | | | |||||
| | * | Make fileExtension configurable | Leonid Logvinov | 2017-12-06 | 2 | -2/+7 |
| | | | |||||
| | * | Rename abi-gen to typed-contracts | Leonid Logvinov | 2017-12-06 | 21 | -26/+26 |
| | | | |||||
| | * | Add docs for typed-contracts | Leonid Logvinov | 2017-12-05 | 1 | -0/+38 |
| | | | |||||
| | * | Remove TODOs | Leonid Logvinov | 2017-12-05 | 1 | -2/+0 |
| | | | |||||
| | * | Introduce separate ContextData type and rework it | Leonid Logvinov | 2017-12-05 | 4 | -12/+27 |
| | | | |||||
| | * | Check ABI is defined | Leonid Logvinov | 2017-12-05 | 1 | -0/+5 |
| | | | |||||
| | * | Introduce a const for 'contract.mustache' | Leonid Logvinov | 2017-12-05 | 1 | -1/+2 |
| | | | |||||
| | * | Improve error message | Leonid Logvinov | 2017-12-05 | 1 | -1/+1 |
| | | | |||||
| | * | Reuse util | Leonid Logvinov | 2017-12-05 | 1 | -1/+1 |
| | | | |||||
| | * | Fix a typo | Leonid Logvinov | 2017-12-05 | 1 | -1/+1 |
| | | | |||||
| | * | Introduce a const for 'function' | Leonid Logvinov | 2017-12-05 | 1 | -1/+3 |
| | | | |||||
| | * | Use lodash's map | Leonid Logvinov | 2017-12-05 | 1 | -2/+2 |
| | | | |||||
| | * | Fix an error message | Leonid Logvinov | 2017-12-05 | 1 | -1/+2 |
| | | | |||||
| | * | Delete abi from typed-contracts | Leonid Logvinov | 2017-12-05 | 5 | -1686/+0 |
| | | | |||||
| | * | Type to-snake-case | Leonid Logvinov | 2017-12-05 | 2 | -2/+5 |
| | | | |||||
| | * | Fix a comment | Leonid Logvinov | 2017-12-05 | 1 | -5/+5 |
| | | | |||||
| | * | Add a comment | Leonid Logvinov | 2017-12-05 | 1 | -0/+1 |
| | | | |||||
| | * | Fix a typo | Leonid Logvinov | 2017-12-05 | 1 | -1/+1 |
| | | | |||||
| | * | Fix linter error | Leonid Logvinov | 2017-12-02 | 1 | -1/+1 |
| | | | |||||
| | * | Update comment | Leonid Logvinov | 2017-12-02 | 6 | -6/+6 |
| | | | |||||
| | * | Add comments before generated contracts | Leonid Logvinov | 2017-12-02 | 5 | -0/+20 |
| | | | |||||
| | * | Use our promisify | Leonid Logvinov | 2017-12-02 | 4 | -18/+27 |
| | | | |||||
| | * | Make target optional | Leonid Logvinov | 2017-12-02 | 1 | -1/+1 |
| | | | |||||
| | * | Remove es6-promisify | Leonid Logvinov | 2017-12-02 | 2 | -7/+0 |
| | | | |||||
| | * | Remove all contract wrapper | Leonid Logvinov | 2017-12-02 | 1 | -98/+0 |
| | | | |||||
| | * | Add async prefix | Leonid Logvinov | 2017-12-02 | 2 | -2/+2 |
| | | | |||||
| | * | Adjust 0x.js to use generated wrappers | Leonid Logvinov | 2017-12-02 | 8 | -27/+76 |
| | | | |||||
| | * | Remove old contract typings | Leonid Logvinov | 2017-12-02 | 1 | -154/+11 |
| | | | |||||
| | * | Add depencies and a command to generate contract wrappers | Leonid Logvinov | 2017-12-02 | 1 | -0/+3 |
| | | | |||||
| | * | Add promisify | Leonid Logvinov | 2017-12-02 | 1 | -0/+24 |
| | | | |||||
| | * | Add class utils | Leonid Logvinov | 2017-12-02 | 1 | -0/+17 |
| | | | |||||
| | * | Add generated contract wrappers | Leonid Logvinov | 2017-12-02 | 6 | -0/+2176 |
| | | | |||||
| | * | Add generator CLI util | Leonid Logvinov | 2017-12-02 | 12 | -0/+1902 |
| | | | |||||
| | * | Add templates | Leonid Logvinov | 2017-12-02 | 7 | -0/+115 |
| | | | |||||
| * | | Remove isomorphic-fetch types from contracts package | Brandon Millman | 2017-12-06 | 2 | -6/+1 |
| |/ | |||||
| * | Merge pull request #247 from 0xProject/feature/addContractsRepo | Amir Bandeali | 2017-12-02 | 104 | -15/+14609 |
| |\ | | | | | | | Add contracts repo | ||||
| | * | Remove duplicate in gitignore | Amir Bandeali | 2017-12-02 | 1 | -1/+0 |
| | | | |||||
| | * | Make class methods that don't use 'this' static | Amir Bandeali | 2017-12-01 | 4 | -89/+92 |
| | | | |||||
| | * | Fix module versions, cleanup scripts | Amir Bandeali | 2017-12-01 | 6 | -59/+51 |
| | | | |||||
| | * | Add README to contracts package | Amir Bandeali | 2017-11-30 | 1 | -0/+51 |
| | | | |||||
| | * | Fix indentations | Amir Bandeali | 2017-11-30 | 30 | -2673/+2705 |
| | | | |||||
| | * | Add contracts to packages, fix most linting errors | Amir Bandeali | 2017-11-30 | 104 | -27/+14544 |
| |/ | |||||
| * | Add orderWatcher to 0x.js docs | Fabio Berger | 2017-11-30 | 3 | -1/+14 |
| | | |||||
* | | Remove spaces | Fabio Berger | 2017-12-06 | 2 | -2/+2 |
| | | |||||
* | | Make exception | Fabio Berger | 2017-12-06 | 1 | -0/+2 |
| | | |||||
* | | Port subproviders over to mono repo, refactor LedgerSubprovider to no longer ↵ | Fabio Berger | 2017-12-06 | 17 | -3/+1289 |
| | | | | | | | | rely on hookedWalletSubprovider. Added unit and integration tests. | ||||
* | | bump version | Fabio Berger | 2017-12-05 | 1 | -1/+1 |
| | | |||||
* | | Move testrpc to top-level package.json and standardize some versions | Fabio Berger | 2017-12-05 | 4 | -13/+25 |
|/ | |||||
* | Merge branch 'development' of github.com:0xProject/0x.js into development | Fabio Berger | 2017-11-30 | 8 | -8/+45 |
|\ | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Publish Update CHANGELOG.md Redeclare Order, SignedOrder, and ECSignature types in connect, remove 0x.js dependency Add SignedOrder and TokenTradeInfo to public interface and fix a HttpClient comment | ||||
| * | Publish | Brandon Millman | 2017-11-30 | 2 | -2/+2 |
| | | | | | | | | | | - @0xproject/connect@0.2.0 - website@0.0.1 | ||||
| * | Update CHANGELOG.md | Brandon Millman | 2017-11-30 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #246 from 0xProject/fix/signedOrderInConnect | Brandon Millman | 2017-11-30 | 7 | -6/+35 |
| |\ | | | | | | | Redeclare Order, SignedOrder, and ECSignature types in connect, remov… | ||||
| | * | Redeclare Order, SignedOrder, and ECSignature types in connect, remove 0x.js ↵ | Brandon Millman | 2017-11-30 | 7 | -6/+35 |
| |/ | | | | | | | dependency | ||||
| * | Merge pull request #245 from 0xProject/fix/exportedTypes | Brandon Millman | 2017-11-30 | 4 | -1/+9 |
| |\ | | | | | | | Add SignedOrder and TokenTradeInfo to public interface and fix a Http… | ||||
| | * | Add SignedOrder and TokenTradeInfo to public interface and fix a HttpClient ↵ | Brandon Millman | 2017-11-30 | 4 | -1/+9 |
| |/ | | | | | | | comment | ||||
* / | Add order and signedOrder to public types | Fabio Berger | 2017-11-30 | 1 | -0/+2 |
|/ | |||||
* | Add TokenTradeInfo to public types | Fabio Berger | 2017-11-30 | 1 | -0/+1 |
| | |||||
* | Merge pull request #244 from 0xProject/feature/connect-docs | Fabio Berger | 2017-11-29 | 13 | -16/+181 |
|\ | | | | | Add Connect Docs | ||||
| * | Merge branch 'development' into feature/connect-docs | Fabio Berger | 2017-11-29 | 2 | -3/+3 |
| |\ | |/ |/| | | | | | | | | | | | | | * development: Fix connect documentation introduction and installation wording # Conflicts: # packages/website/md/docs/connect/installation.md # packages/website/md/docs/connect/introduction.md | ||||
* | | Fix connect documentation introduction and installation wording | Brandon Millman | 2017-11-29 | 2 | -3/+3 |
| | | |||||
| * | Rename @0xproject/connect to 0x Connect | Fabio Berger | 2017-11-29 | 2 | -2/+2 |
| | | |||||
| * | Rename packageName to displayName for clarity | Fabio Berger | 2017-11-29 | 7 | -9/+9 |
| | | |||||
| * | Fix phantom `Contracts` section issue | Fabio Berger | 2017-11-29 | 1 | -0/+5 |
| | | |||||
| * | Add 0x Connect to footer | Fabio Berger | 2017-11-29 | 1 | -0/+4 |
| | | |||||
| * | Update 0x.js to 0.27.1 | Fabio Berger | 2017-11-29 | 2 | -2/+2 |
| | | |||||
| * | Lock the 0x.js version used in website | Fabio Berger | 2017-11-29 | 2 | -1/+21 |
| | | |||||
| * | Merge branch 'development' into feature/connect-docs | Fabio Berger | 2017-11-29 | 6 | -17/+8 |
| |\ | |/ |/| | | | | | | | | | * development: rename for clarity remove unused code Publish | ||||
* | | Merge pull request #243 from 0xProject/fix/refactorDocs | Fabio Berger | 2017-11-29 | 21 | -691/+548 |
|\ \ | | | | | | | Refactor docs | ||||
| * | | rename for clarity | Fabio Berger | 2017-11-29 | 2 | -4/+4 |
| | | | |||||
| * | | remove unused code | Fabio Berger | 2017-11-29 | 1 | -9/+0 |
| | | | |||||
* | | | Publish | Leonid Logvinov | 2017-11-29 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | - 0x.js@0.27.1 - @0xproject/connect@0.1.2 - website@0.0.0 | ||||
| | * | Add 0x Connect Docs to the menu and topBar | Fabio Berger | 2017-11-29 | 2 | -6/+22 |
| | | | |||||
| | * | Add connect docs | Fabio Berger | 2017-11-29 | 3 | -0/+105 |
| | | | |||||
| | * | Add subPackageName and get rid of hard-coded 0x.js in sourceLink | Fabio Berger | 2017-11-29 | 6 | -2/+17 |
| |/ | |||||
| * | Merge branch 'development' into fix/refactorDocs | Fabio Berger | 2017-11-29 | 21 | -180/+249 |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (30 commits) Export TransactionOpts type Make website private Publish Update CHANGELOG Change interval to 1h Rename Add ifExists to cleanupJobInterval Add a cleanup job to an order watcher Improve the comment Add CHANGELOG comment Add a HACK comment Normalise subprovider names Remove a comment Fix a typo Pin testrpc version Remove gas params from tests Add fake gas estimate suprovider for tests Revert "Fix website linter errors" Fix website linter errors Fix tests ... # Conflicts: # packages/website/ts/utils/constants.ts | ||||
* | | Export TransactionOpts type | Leonid Logvinov | 2017-11-29 | 3 | -0/+6 |
| | | |||||
* | | Make website private | Leonid Logvinov | 2017-11-29 | 2 | -1/+2 |
| | | |||||
* | | Publish | Leonid Logvinov | 2017-11-29 | 6 | -16/+16 |
| | | | | | | | | | | | | | | | | | | - 0x.js@0.27.0 - @0xproject/assert@0.0.6 - @0xproject/connect@0.1.1 - @0xproject/json-schemas@0.6.9 - @0xproject/tslint-config@0.2.0 - website@0.0.0 | ||||
* | | Update CHANGELOG | Leonid Logvinov | 2017-11-29 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #235 from 0xProject/feature/gasPriceGasLimit | Leonid | 2017-11-29 | 13 | -159/+177 |
|\ \ | | | | | | | Add optional config for gasPrice and gasLimit for every transaction sending method | ||||
| * | | Improve the comment | Leonid Logvinov | 2017-11-29 | 1 | -1/+3 |
| | | | |||||
| * | | Add CHANGELOG comment | Leonid Logvinov | 2017-11-29 | 1 | -0/+1 |
| | | | |||||
| * | | Add a HACK comment | Leonid Logvinov | 2017-11-29 | 1 | -0/+3 |
| | | | |||||
| * | | Normalise subprovider names | Leonid Logvinov | 2017-11-29 | 3 | -6/+6 |
| | | | |||||
| * | | Remove a comment | Leonid Logvinov | 2017-11-29 | 1 | -1/+0 |
| | | | |||||
| * | | Fix a typo | Leonid Logvinov | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Pin testrpc version | Leonid Logvinov | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| * | | Remove gas params from tests | Leonid Logvinov | 2017-11-29 | 1 | -6/+0 |
| | | | |||||
| * | | Add fake gas estimate suprovider for tests | Leonid Logvinov | 2017-11-29 | 5 | -3/+37 |
| | | | |||||
| * | | Revert "Fix website linter errors" | Leonid Logvinov | 2017-11-29 | 7 | -249/+233 |
| | | | | | | | | | | | | This reverts commit 6e2a69976b9d537e345f793e89adc74c352ad7ac. | ||||
| * | | Fix website linter errors | Leonid Logvinov | 2017-11-28 | 7 | -233/+249 |
| | | | |||||
| * | | Fix tests | Leonid Logvinov | 2017-11-28 | 2 | -14/+9 |
| | | | |||||
| * | | Fix a comment | Leonid Logvinov | 2017-11-28 | 1 | -4/+4 |
| | | | |||||
| * | | Fix tests | Leonid Logvinov | 2017-11-28 | 1 | -0/+1 |
| | | | |||||
| * | | Increase gas margin | Leonid Logvinov | 2017-11-28 | 1 | -2/+1 |
| | | | |||||
| * | | Fix defaults for shouldValidate | Leonid Logvinov | 2017-11-28 | 1 | -7/+21 |
| | | | |||||
| * | | Update MAX_REASONABLE_GAS_COST_IN_WEI | Leonid Logvinov | 2017-11-28 | 1 | -1/+1 |
| | | | |||||
| * | | Add gas margin and remove undefined values | Leonid Logvinov | 2017-11-28 | 1 | -10/+14 |
| | | | |||||
| * | | Update testrpc | Leonid Logvinov | 2017-11-28 | 2 | -1/+11 |
| | | | |||||
| * | | Add an initializer for txOpts in etherToken | Leonid Logvinov | 2017-11-28 | 1 | -2/+6 |
| | | | |||||
| * | | Add CHANGELOG entry | Leonid Logvinov | 2017-11-28 | 1 | -0/+1 |
| | | | |||||
| * | | Add option config for gasPrice and gasLimit for every transaction sending method | Leonid Logvinov | 2017-11-28 | 5 | -138/+95 |
| | | | |||||
* | | | Merge pull request #242 from 0xProject/feature/orderWatcherCleanup | Leonid | 2017-11-29 | 2 | -3/+47 |
|\ \ \ | | | | | | | | | Add a cleanup job to an order watcher | ||||
| * | | | Change interval to 1h | Leonid Logvinov | 2017-11-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Rename | Leonid Logvinov | 2017-11-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add ifExists to cleanupJobInterval | Leonid Logvinov | 2017-11-29 | 1 | -4/+4 |
| | | | | |||||
| * | | | Add a cleanup job to an order watcher | Leonid Logvinov | 2017-11-29 | 2 | -2/+46 |
|/ / / | |||||
| | * | Refactor the topLevel documentation react components for 0x.js and Smart ↵ | Fabio Berger | 2017-11-29 | 10 | -599/+323 |
| | | | | | | | | | | | | contracts into a single component | ||||
| | * | Fix tslint error | Fabio Berger | 2017-11-29 | 1 | -1/+1 |
| | | | |||||
| | * | Refactor docs to be more declarative, put all hard-coded doc-related data in ↵ | Fabio Berger | 2017-11-29 | 16 | -286/+428 |
| |/ |/| | | | | | one place so it easier to add new doc pages | ||||
* | | Last remaining website fixes | Fabio Berger | 2017-11-28 | 4 | -10/+12 |
| | | |||||
* | | fix remaining tslint errors | Fabio Berger | 2017-11-28 | 87 | -469/+496 |
| | | |||||
* | | Fix tslint issues | Fabio Berger | 2017-11-28 | 20 | -257/+275 |
| | | |||||
* | | Add lint command to website sub-package | Fabio Berger | 2017-11-28 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #233 from 0xProject/feature/passNetworkId | Fabio Berger | 2017-11-28 | 78 | -2150/+997 |
|\ | | | | | Forces the users of 0x.js to pass the network id | ||||
| * | Fix tests | Leonid Logvinov | 2017-11-28 | 1 | -13/+18 |
| | | |||||
| * | Fix merge conflicts | Leonid Logvinov | 2017-11-28 | 4 | -17/+7 |
| | | |||||
| * | Merge branch 'development' into feature/passNetworkId | Leonid | 2017-11-28 | 316 | -144/+26300 |
| |\ | |||||
| * | | Update CHANGELOG.md | Leonid Logvinov | 2017-11-24 | 1 | -0/+1 |
| | | | |||||
| * | | Remove ContractDoesNotExist error and replace it with more specific errors | Leonid Logvinov | 2017-11-24 | 3 | -6/+21 |
| | | | |||||
| * | | Add a regression test | Leonid Logvinov | 2017-11-24 | 1 | -5/+23 |
| | | | |||||
| * | | Pass networkId on provider update | Leonid Logvinov | 2017-11-24 | 7 | -12/+12 |
| | | | |||||
| * | | Fix linter issue | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Remove outdated comment | Leonid Logvinov | 2017-11-24 | 1 | -2/+0 |
| | | | |||||
| * | | Improve a comment | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Add a comment | Leonid Logvinov | 2017-11-24 | 1 | -0/+1 |
| | | | |||||
| * | | Reuse the protected function to get contract address | Leonid Logvinov | 2017-11-24 | 1 | -10/+2 |
| | | | |||||
| * | | Move variable declaration inside the if | Leonid Logvinov | 2017-11-24 | 1 | -0/+12 |
| | | | |||||
| * | | Update CHANGELOG.md | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix rebasing issues | Leonid Logvinov | 2017-11-24 | 3 | -10/+13 |
| | | | |||||
| * | | Add CHANGELOG entry | Leonid Logvinov | 2017-11-24 | 1 | -0/+3 |
| | | | |||||
| * | | Revert "Remove redundant async" | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 8d11ababd62d947e338757f57c41179510b11338. | ||||
| * | | Refactor getContractAddress to contractWrapper | Leonid Logvinov | 2017-11-24 | 5 | -41/+17 |
| | | | |||||
| * | | Remove redundant async | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fix the artifacts | Leonid Logvinov | 2017-11-24 | 2 | -2/+2 |
| | | | |||||
| * | | Remove unused asyncs | Leonid Logvinov | 2017-11-24 | 1 | -2/+2 |
| | | | |||||
| * | | Auto-fix linter errors in other mono-repo packages | Leonid Logvinov | 2017-11-24 | 12 | -40/+52 |
| | | | |||||
| * | | Add type information for the linter | Leonid Logvinov | 2017-11-24 | 2 | -2/+2 |
| | | | |||||
| * | | Autofix json-schemas linter errors | Leonid Logvinov | 2017-11-24 | 5 | -33/+35 |
| | | | |||||
| * | | Fix the imports order | Leonid Logvinov | 2017-11-24 | 25 | -1550/+201 |
| | | | |||||
| * | | Enforce comments on public methods | Leonid Logvinov | 2017-11-24 | 1 | -0/+7 |
| | | | |||||
| * | | Enable some new linter rules and fix the issues | Leonid Logvinov | 2017-11-24 | 12 | -167/+201 |
| | | | |||||
| * | | Auto-fix linter errors | Leonid Logvinov | 2017-11-24 | 28 | -148/+196 |
| | | | |||||
| * | | Don't reassign the parameter | Leonid Logvinov | 2017-11-24 | 1 | -3/+3 |
| | | | |||||
| * | | Fix linter issues | Leonid Logvinov | 2017-11-24 | 2 | -2/+2 |
| | | | |||||
| * | | Await block reconcilation | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Remove even more asyncs | Leonid Logvinov | 2017-11-24 | 8 | -29/+44 |
| | | | |||||
| * | | Add project config to tslint which enables some type-dependent rules | Leonid Logvinov | 2017-11-24 | 1 | -1/+1 |
| | | | |||||
| * | | Make zeroEx.tokenRegistry.getContractAddress non-async | Leonid Logvinov | 2017-11-24 | 1 | -5/+12 |
| | | | |||||
| * | | Make exchange subscriptions non-async | Leonid Logvinov | 2017-11-24 | 2 | -8/+8 |
| | | | |||||
| * | | Cleanup order watcher from redundant asyncs | Leonid Logvinov | 2017-11-24 | 5 | -30/+34 |
| | | | |||||
| * | | Make zeroEx.exchange.getContractAddress non-async | Leonid Logvinov | 2017-11-24 | 5 | -12/+18 |
| | | | |||||
| * | | Add ZRX artifacts | Leonid Logvinov | 2017-11-24 | 1 | -0/+17 |
| | | | |||||
| * | | Make getZRXTokenAddress non async | Leonid Logvinov | 2017-11-24 | 11 | -56/+40 |
| | | | |||||
| * | | Store networkId in web3Wrapper | Leonid Logvinov | 2017-11-24 | 2 | -20/+9 |
| | | | |||||
| * | | Add networkId to zeroExConfig schema | Leonid Logvinov | 2017-11-24 | 1 | -0/+5 |
| | | | |||||
| * | | Adjust the tests | Leonid Logvinov | 2017-11-24 | 14 | -29/+73 |
| | | | |||||
| * | | Fix CI tests | Leonid Logvinov | 2017-11-24 | 1 | -1/+7 |
| | | | |||||
| * | | Add networkId to ZeroExConfig and make it required | Leonid Logvinov | 2017-11-24 | 2 | -17/+10 |
| | | | |||||
* | | | Merge pull request #241 from 0xProject/fix/moveConnectTypes | Brandon Millman | 2017-11-28 | 3 | -44/+49 |
|\ \ \ | |_|/ |/| | | Move all connect types into types.ts | ||||
| * | | Move all connect types into types.ts | Brandon Millman | 2017-11-28 | 3 | -44/+49 |
|/ / | |||||
* | | Merge pull request #240 from 0xProject/fix/websiteMdDirectory | Brandon Millman | 2017-11-28 | 14 | -5/+90 |
|\ \ | | | | | | | Add md directory to website package and change generated docs directory | ||||
| * | | Add md directory to website package and change generated docs directory | Brandon Millman | 2017-11-28 | 14 | -5/+90 |
| | | | |||||
* | | | Merge pull request #239 from 0xProject/fix/docs | Fabio Berger | 2017-11-28 | 5 | -8/+22 |
|\ \ \ | |/ / |/| | | Fix 0x.js Doc Issues | ||||
| * | | remove comment | Fabio Berger | 2017-11-28 | 1 | -1/+0 |
| | | | |||||
| * | | Add link to Provider explanation | Fabio Berger | 2017-11-28 | 1 | -1/+2 |
| | | | |||||
| * | | Add "Web3" prefix to web3 alias types and link to the correct line in the ↵ | Fabio Berger | 2017-11-28 | 2 | -2/+14 |
| | | | | | | | | | | | | web3 typings | ||||
| * | | Fix overlapping arg names | Fabio Berger | 2017-11-28 | 1 | -2/+1 |
| | | | |||||
| * | | Fix source links in 0x.js docs | Fabio Berger | 2017-11-28 | 1 | -3/+6 |
|/ / | |||||
* | | Merge pull request #237 from 0xProject/addWebsite | Fabio Berger | 2017-11-28 | 292 | -100/+26151 |
|\ \ | | | | | | | Add Website to Mono Repo | ||||
| * | | Fix subscriptions given latest changes to 0x.js | Fabio Berger | 2017-11-24 | 1 | -4/+5 |
| | | | |||||
| * | | Merge branch 'development' into addWebsite | Fabio Berger | 2017-11-24 | 21 | -78/+450 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (41 commits) Add validation fix to changelog Fix tests now that we no longer fire duplicate orderWatcher events Add comment about BlockParamLiteral explaining the omission of Earliest Add missing type Pass 'latest' to ExchangeTransferSimulator when used for validating orders, and pass 'pending' when used in the order watcher. Remove `Earliest` from blockParamLiterals since specifying block 0 is trivial and this type can be reused in situations where the options are pending or latest Rename removed to isRemoved Add CHANGELOG entry Make DecodedLogEvent contain web3 log under a log subkey Update to Async call Fix nits Add @0xproject/connect to the main README Fix connect CHANGELOG version Publish Fix npm auth issues Perform the division last to not compound any errors add a test constant for ZRX decimals Add a test for when the ratio is < 1 Remove only calculatedFillableAmountPlusFees ... | ||||
| * | | | Add exit code 0 because it is expected that uglifying the code throws an error | Fabio Berger | 2017-11-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | update tokenByAddress after tokenStateByAddress to avoid race-condition | Fabio Berger | 2017-11-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add error when unexpected condition hit | Fabio Berger | 2017-11-24 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix alignment | Fabio Berger | 2017-11-24 | 1 | -9/+9 |
| | | | | |||||
| * | | | Add missing keys | Fabio Berger | 2017-11-24 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fix bug | Fabio Berger | 2017-11-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'development' into addWebsite | Fabio Berger | 2017-11-23 | 8 | -16/+50 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Revert "Publish" Publish Add actual version to CHANGELOG Add blockchainLifecycle management to the ExpirationWatcher test Update connect CHANGELOG.md in preperation for publishing Add TODO comment before BigNumber.config() call Prepare connect package for publishing | ||||
| * | | | | Force the clearance of tradeHistory | Fabio Berger | 2017-11-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'development' into addWebsite | Fabio Berger | 2017-11-23 | 12 | -20/+279 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (33 commits) Last renames Refactor while condition Fix tests Fix tests Fix a typo Fix test:circleci command Check if transactionReceipt exists before normalizing it Address nits Remove old comment Fix async callbacks Check if callback exists Rename Pass callback down Remove custom heap and use bintrees Add expirationMarginMs Add defaults Fix typos Rename orderLifetime to orderLifetimeS Reference types directly Add ifExists suffix ... | ||||
| * | | | | | Upgrade to latest 0x.js version and refactor subscriptions to use latest ↵ | Fabio Berger | 2017-11-23 | 4 | -30/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | interface | ||||
| * | | | | | add bundles to gitignore | Fabio Berger | 2017-11-23 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fix build bug | Fabio Berger | 2017-11-23 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into addWebsite | Fabio Berger | 2017-11-22 | 9 | -24/+56 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix a typo in postpublish utils tags -> tag Publish Revert "Publish" Publish Add instanceOf assertion Rename toDecimal to hexToDecimal Add PR numbers Add postFormatter for logs | ||||
| * | | | | | | Add website to mono repo, update packages to align with existing ↵ | Fabio Berger | 2017-11-22 | 292 | -100/+26118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-packages, use new subscribeAsync 0x.js method | ||||
* | | | | | | | Update CHANGELOG.md | Fabio Berger | 2017-11-24 | 1 | -0/+1 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Add validation fix to changelog | Fabio Berger | 2017-11-24 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #236 from 0xProject/fix/validateOrdersAgainstLatestBlock | Fabio Berger | 2017-11-24 | 10 | -36/+31 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix/validate orders against latest block | ||||
| * | | | | | Fix tests now that we no longer fire duplicate orderWatcher events | Fabio Berger | 2017-11-24 | 1 | -15/+3 |
| | | | | | | |||||
| * | | | | | Add comment about BlockParamLiteral explaining the omission of Earliest | Fabio Berger | 2017-11-24 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Add missing type | Fabio Berger | 2017-11-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into validateOrdersAgainstLatestBlock | Fabio Berger | 2017-11-24 | 5 | -16/+25 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Rename removed to isRemoved Add CHANGELOG entry Make DecodedLogEvent contain web3 log under a log subkey | ||||
* | | | | | | Merge pull request #234 from 0xProject/feature/eventTypes | Leonid | 2017-11-24 | 5 | -16/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make DecodedLogEvent contain web3 log under a log subkey | ||||
| * | | | | | | Rename removed to isRemoved | Leonid Logvinov | 2017-11-24 | 3 | -9/+9 |
| | | | | | | | |||||
| * | | | | | | Add CHANGELOG entry | Leonid Logvinov | 2017-11-24 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Make DecodedLogEvent contain web3 log under a log subkey | Leonid Logvinov | 2017-11-24 | 4 | -10/+15 |
|/ / / / / / | |||||
| * | | | | | Pass 'latest' to ExchangeTransferSimulator when used for validating orders, ↵ | Fabio Berger | 2017-11-24 | 8 | -19/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | and pass 'pending' when used in the order watcher. | ||||
| * | | | | | Remove `Earliest` from blockParamLiterals since specifying block 0 is ↵ | Fabio Berger | 2017-11-24 | 1 | -1/+0 |
|/ / / / / | | | | | | | | | | | | | | | | trivial and this type can be reused in situations where the options are pending or latest | ||||
* | | | | | Merge pull request #230 from 0xProject/feature/removeDuplicateEvents | Fabio Berger | 2017-11-24 | 1 | -0/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Add an order state cache to filter out duplicate events | ||||
| * | | | | | Add an order state cache to filter out duplicate events | Leonid Logvinov | 2017-11-21 | 1 | -0/+12 |
| |/ / / / | |||||
* | | | | | Merge pull request #226 from dekz/feature/calculate-remaining-proportions | Fabio Berger | 2017-11-24 | 5 | -21/+375 |
|\ \ \ \ \ | | | | | | | | | | | | | Calculate remaining proportions from fee to ratio proportions | ||||
| * | | | | | Update to Async call | Jacob Evans | 2017-11-23 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | Fix nits | Jacob Evans | 2017-11-23 | 2 | -6/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into feature/calculate-remaining-proportions | Jacob Evans | 2017-11-23 | 0 | -0/+0 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'development' into feature/calculate-remaining-proportions | Jacob Evans | 2017-11-23 | 32 | -113/+626 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Add @0xproject/connect to the main README | Brandon Millman | 2017-11-23 | 1 | -0/+1 |
| | | | | | |