aboutsummaryrefslogtreecommitdiffstats
path: root/packages/migrations
Commit message (Expand)AuthorAgeFilesLines
* Rename and update some artifact locationsAlex Browne2018-09-0523-272/+89
* Rename 2.0.0-beta-testnet to 2.0.0-testnetAlex Browne2018-09-0514-0/+0
* Add missing testnet addresses to 2.0.0-mainnet artifactsAlex Browne2018-09-056-6/+96
* Copy artifacts from 2.0.0-beta-testnet that do not appear in 2.0.0-mainnetAlex Browne2018-09-058-0/+13387
* Merge branch 'deployment/2.0.0-beta-testnet/ropsten' of github.com:0xProject/...Jacob Evans2018-09-0513-7/+5904
|\
| * merge developmentFabio Berger2018-09-0513-7/+5904
| |\
| | * Update mainnet artifactsAmir Bandeali2018-09-056-0/+5711
| | * Update mainnet configsAmir Bandeali2018-09-053-4/+19
| | * Add mainnet migrationsAmir Bandeali2018-09-055-5/+176
* | | Revert Forwarder address for GanacheJacob Evans2018-09-051-1/+1
* | | Remove Rinkeby from Exchange.jsonJacob Evans2018-09-051-5/+0
|/ /
* | Revert the exchange address changeJacob Evans2018-09-051-2/+2
* | Tslint magic-numberJacob Evans2018-09-051-0/+2
* | Ropsten/Kovan Contract deploymentJacob Evans2018-09-0540-100812/+3631
|/
* feat: Add support for TypeScript project references (#991)Alex Browne2018-08-302-3/+3
* Update OrderValidator artifact to include getBalancesAndAllowances functionBrandon Millman2018-08-281-62/+113
* Publishcontracts@2.1.42@0xproject/website@0.0.46@0xproject/web3-wrapper@2.0.1@0xproject/utils@1.0.7@0xproject/types@1.0.1-rc.6@0xproject/testnet-faucets@1.0.43@0xproject/subproviders@2.0.1@0xproject/sra-spec@1.0.1-rc.6@0xproject/sra-report@1.0.7@0xproject/sol-resolver@1.0.7@0xproject/sol-cov@2.1.1@0xproject/sol-compiler@1.1.1@0xproject/react-shared@1.0.8@0xproject/react-docs@1.0.7@0xproject/order-watcher@1.0.1-rc.5@0xproject/order-utils@1.0.1-rc.6@0xproject/monorepo-scripts@1.0.7@0xproject/migrations@1.0.6@0xproject/metacoin@0.0.17@0xproject/json-schemas@1.0.1-rc.6@0xproject/forwarder-helper@1.0.1-rc.2@0xproject/fill-scenarios@1.0.1-rc.5@0xproject/dev-utils@1.0.6@0xproject/contract-wrappers@1.0.1-rc.5@0xproject/connect@2.0.0-rc.2@0xproject/base-contract@2.0.1@0xproject/assert@1.0.7@0xproject/abi-gen@1.0.70x.js@1.0.1-rc.6Fabio Berger2018-08-271-10/+10
* Updated CHANGELOGSFabio Berger2018-08-272-0/+13
* Add testnet network info to OrderValidator artifactBrandon Millman2018-08-251-1/+7
* Publishethereum-types@1.0.5contracts@2.1.41@0xproject/website@0.0.45@0xproject/web3-wrapper@2.0.0@0xproject/utils@1.0.6@0xproject/typescript-typings@1.0.5@0xproject/types@1.0.1-rc.5@0xproject/tslint-config@1.0.6@0xproject/testnet-faucets@1.0.42@0xproject/subproviders@2.0.0@0xproject/sra-report@1.0.6@0xproject/sra-api@1.0.1-rc.5@0xproject/sol-resolver@1.0.6@0xproject/sol-cov@2.1.0@0xproject/sol-compiler@1.1.0@0xproject/react-shared@1.0.7@0xproject/react-docs@1.0.6@0xproject/order-watcher@1.0.1-rc.4@0xproject/order-utils@1.0.1-rc.4@0xproject/monorepo-scripts@1.0.6@0xproject/migrations@1.0.5@0xproject/metacoin@0.0.16@0xproject/json-schemas@1.0.1-rc.5@0xproject/forwarder-helper@1.0.1-rc.1@0xproject/fill-scenarios@1.0.1-rc.4@0xproject/dev-utils@1.0.5@0xproject/contract-wrappers@1.0.1-rc.4@0xproject/connect@2.0.0-rc.1@0xproject/base-contract@2.0.0@0xproject/assert@1.0.6@0xproject/abi-gen@1.0.60x.js@1.0.1-rc.4Fabio Berger2018-08-251-13/+13
* Updated CHANGELOGSFabio Berger2018-08-252-3/+16
* Remove superfluous depFabio Berger2018-08-231-1/+0
* Merge development branchFabio Berger2018-08-2244-59545/+4756
|\
| * Add ZRX balances and allowances to TraderInfoAmir Bandeali2018-08-223-24/+242
| * Add OrderValidator to migrationsAmir Bandeali2018-08-226-4/+600
| * Remove redundant constructor argsAmir Bandeali2018-08-221-2/+0
| * remove more v2 contract artifactsF. Eugene Aumson2018-08-211-317/+0
| * change clean to also remove generated artifactsF. Eugene Aumson2018-08-211-1/+1
| * remove disabled scriptsF. Eugene Aumson2018-08-211-2/+0
| * remove v2 contract artifactsF. Eugene Aumson2018-08-2135-58512/+6
| * Update artifactsAmir Bandeali2018-08-177-52/+195
| * Increase max mintable amountAmir Bandeali2018-08-172-15/+15
| * Fix DummyERC721ReceiverAmir Bandeali2018-08-172-109/+25
| * Update artifactsAmir Bandeali2018-08-179-98/+3263
* | Move types from sol-compiler to types so they can be used in other places wit...Fabio Berger2018-08-225-4/+5
* | Merge developmentFabio Berger2018-08-171-2/+2
|\|
| * Bump copyfiles from 1.2.0 to 2.0.0dependabot[bot]2018-08-151-1/+1
| * feat: Upgrade TypeScript to 3.0.1Alex Browne2018-08-151-1/+1
* | Merge developmentFabio Berger2018-08-1514-333/+257
|\|
| * PublishAlex Browne2018-08-141-36/+25
| * Updated CHANGELOGSAlex Browne2018-08-144-65/+74
| * fix contract-wrappers json-schemasfragosti2018-08-1010-258/+173
| * fix: Update dependenciesAlex Browne2018-08-101-1/+1
| * Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-091-11/+22
| * Update TypeScript to version 2.9.2Alex Browne2018-08-091-1/+1
* | Remove all in-package monorepo-scripts by adding doc gen/upload and aggregate...Fabio Berger2018-07-302-11/+1
|/
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-278-1139/+7
* Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4Fabio Berger2018-07-261-10/+10
* Updated CHANGELOGSFabio Berger2018-07-261-1/+2
* Point to actual current versionFabio Berger2018-07-261-2/+2
* Fix changelogs and package versions for ones that weren't publishedFabio Berger2018-07-262-2/+1
* Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3Fabio Berger2018-07-261-14/+14
* Updated CHANGELOGSFabio Berger2018-07-262-0/+13
* Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2Fabio Berger2018-07-261-14/+14
* Updated CHANGELOGSFabio Berger2018-07-262-0/+13
* Revert to publishing ethereum-typesFabio Berger2018-07-261-1/+1
* Temporarily have all packages depend on an older, published version of ethere...Fabio Berger2018-07-261-1/+1
* Prettier fixesFabio Berger2018-07-262-9/+11
* Missing artifactFabio Berger2018-07-261-0/+723
* New WETH9 artifactsFabio Berger2018-07-262-36/+36
* Update artifacts in contract-wrappers, generate artifacts and improve READMEFabio Berger2018-07-268-1/+10408
* Update the kovan addresses in artifactsFabio Berger2018-07-254-6/+6
* Improve the README instructions for migrationsFabio Berger2018-07-251-2/+22
* Use infuraFabio Berger2018-07-252-2/+2
* Update v2-beta-testnet migrationFabio Berger2018-07-2511-259/+45542
* Update artifactFabio Berger2018-07-251-8/+8
* Revert "Temporarily add changelog & package.json version changes"Fabio Berger2018-07-252-13/+0
* Temporarily add changelog & package.json version changesFabio Berger2018-07-242-0/+13
* Changed artifactsFabio Berger2018-07-2413-414/+483
* Revert "Revert "Publish""Fabio Berger2018-07-241-17/+17
* Revert "Publish"Leonid Logvinov2018-07-231-17/+17
* PublishLeonid Logvinov2018-07-231-17/+17
* Updated CHANGELOGSLeonid Logvinov2018-07-235-43/+141
* Add missing timestamps in CHANGELOGsLeonid Logvinov2018-07-231-0/+1
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-231-1/+1
|\
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-181-1/+1
* | Add missing timestamp to CHANGELOG entriesFabio Berger2018-07-211-0/+1
* | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-07-201-0/+1
|\ \
| * | Fix linter errorLeonid Logvinov2018-07-201-0/+1
* | | Add missing dep in migrationsFabio Berger2018-07-201-0/+1
|/ /
* | Add monorepo-scripts postpublish.tsLeonid Logvinov2018-07-201-0/+8
* | Change all package to depend on the new @0xproject/migrations@1.0.0Leonid Logvinov2018-07-201-1/+2
* | @0xproject/migrations@1.0.0Leonid Logvinov2018-07-202-1/+9
* | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/sol-compiler@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/dev-utils@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/subproviders@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/base-contract@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/abi-gen@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/utils@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/types@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/tslint-config@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new @0xproject/typescript-typings@1.0.0Leonid Logvinov2018-07-201-1/+1
* | Change all package to depend on the new ethereum-types@1.0.0Leonid Logvinov2018-07-201-1/+1
* | merge v2-prototypeFabio Berger2018-07-187-773/+133
|\ \
| * | Fix a bad mergeLeonid Logvinov2018-07-187-7/+49
| * | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-181-4/+4
| |\|
| * | MergeLeonid Logvinov2018-07-184-26/+109
| * | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-182-3/+3
| |\ \
| * \ \ Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-162-11/+4
| |\ \ \
| * | | | Upgrade tslint to use prefer-readonlyLeonid Logvinov2018-07-131-1/+1
| * | | | Update contract artifactsLeonid Logvinov2018-07-1310-804/+39
* | | | | Update package versionsFabio Berger2018-07-181-9/+9
* | | | | Update changelogsFabio Berger2018-07-182-0/+13
| |_|_|/ |/| | |
* | | | Merge pull request #884 from 0xProject/export-more-0x.jsFabio Berger2018-07-181-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | merge v2-prototypeFabio Berger2018-07-181-9/+9
| |\ \ \
| | * | | Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-171-9/+9
| | | |/ | | |/|
| * / | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-171-4/+4
| |/ /
* | | Fix tslint issuesLeonid Logvinov2018-07-172-11/+11
* | | Upgrade tslint to the newest versionLeonid Logvinov2018-07-171-1/+1
|/ /
* | Export Web3ProviderEngine from subproviders packageFabio Berger2018-07-132-5/+3
* | -fetch';Fabio Berger2018-07-131-7/+2
|/
* Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-112-8/+8
* Add Migrations for ForwarderJacob Evans2018-07-112-1/+17
* Update artifactsAmir Bandeali2018-07-1127-634/+101453
* Update package versionsFabio Berger2018-07-101-10/+10
* Update changelogsFabio Berger2018-07-092-0/+13
* Merge pull request #822 from 0xProject/v2-contract-wrappers-WIPLeonid Logvinov2018-07-0625-16/+5284
|\
| * Upgrade artifactsLeonid Logvinov2018-07-052-8/+183
| * Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-057-168/+155
| * Upgrade artifactsLeonid Logvinov2018-07-0516-1/+5071
| * Merge branch 'v2-prototype' into v2-contract-wrappers-WIPLeonid Logvinov2018-07-0521-185/+3758
| |\
| * | Set the interval to 0 in awaitTranscationSuccessAsyncLeonid Logvinov2018-06-296-12/+48
| * | Fix the token supply in migrationsLeonid 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
* | | Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-064-88/+1008
|\ \ \ | |_|/ |/| |
| * | Forwarding contract (squashed commits)Jacob Evans2018-07-065-104/+1024
* | | Merge pull request #812 from 0xProject/fix/revert-assertions-improvementsAlex Browne2018-07-041-16/+16
|\ \ \
| * | | Improve robustness of revert reason assertionsAlex Browne2018-07-031-16/+16
* | | | Fix alignmentFabio Berger2018-07-041-1/+1
* | | | Update web3-provider-engine version w/o caretFabio Berger2018-07-031-1/+1
* | | | Update web3-provider-engineFabio Berger2018-07-031-1/+1
|/ / /
* / / Update incorrect versions of depsFabio Berger2018-07-021-1/+1
|/ /
* | Update 2.0.0 artifactsAmir Bandeali2018-06-305-149/+99
* | Move ledgerhq module declarations to typescript-typingsAmir Bandeali2018-06-303-24/+2
* | Export LedgerEthereumClient type in subprovidersAmir Bandeali2018-06-303-49/+18
* | Update artifactsAmir Bandeali2018-06-304-12/+26
* | Add logging and updated artifactsAmir Bandeali2018-06-305-32/+45
* | Fix migrationsAmir Bandeali2018-06-307-3451/+3402
* | Run prettierAmir Bandeali2018-06-304-3369/+3442
* | Add Kovan artifactsAmir Bandeali2018-06-304-0/+3373
* | Use ledger subproviderAmir Bandeali2018-06-3013-46/+159
* | Add Kovan migrationsAmir Bandeali2018-06-3010-13/+152
|/
* Register the asset proxies to exchangeJacob Evans2018-06-291-5/+26
* Remove network 50 detailsFabio Berger2018-06-286-48/+12
* Re-generate and clean up artifacts for 2.0.0Fabio Berger2018-06-2823-5076/+1144
* Add missing `AssetProxyOwner` from `compile:v2` commandFabio Berger2018-06-281-1/+1
* Encode ZRX address as needed.Fabio Berger2018-06-282-1/+3
* Add optimizer settings to `migrations` `compiler.json`Fabio Berger2018-06-281-0/+4
* Fix buildAmir Bandeali2018-06-273-0/+386
* Update artifactsAmir Bandeali2018-06-2730-2689/+1363
* Add missing artifactsFabio Berger2018-06-222-0/+194
* Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-211-60/+102
* Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `se...Greg Hysen2018-06-211-59/+27
* Migrations after rebasingGreg Hysen2018-06-2113-188/+320
* ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-8/+8
* Rename makerEpoch => orderEpochAmir Bandeali2018-06-205-64/+64
* Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-203-39/+323
* Update all package versions to match latest published to NPMFabio Berger2018-06-191-11/+11
* Update CHANGELOG's with publishes performed on development branchFabio Berger2018-06-192-1/+18
* Make isValidSignature publicAmir Bandeali2018-06-196-38/+316
* Merge pull request #682 from 0xProject/feature/contracts/popProxyIdAmir Bandeali2018-06-139-188/+182
|\
| * Update artifactsAmir Bandeali2018-06-139-188/+182
* | Refactor sol-cov to avoid keeping traceInfo in memoryAlex Browne2018-06-131-119/+0
|/
* Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-1216-148/+849
* Await transactions in migrationsLeonid Logvinov2018-06-091-35/+46
* Fix typosLeonid Logvinov2018-06-091-1/+1
* Await transactions in migrationsLeonid Logvinov2018-06-091-4/+12
* Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-0914-143/+79
* Minor fixes after rebaseGreg Hysen2018-06-081-735/+1
* updated migrations artifactsGreg Hysen2018-06-081-1/+735
* LibAssetProxyDecoder testsGreg Hysen2018-06-081-8/+39
* Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-081-0/+88
* Fix tslint failureFabio Berger2018-06-081-7/+7
* Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-13/+17
|\
| * Remove extra logs and other small fixesAlex Browne2018-06-071-11/+11
| * Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-073-614/+611
* | Get build and tests to passfragosti2018-06-0723-1497/+1402
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-2/+2
|\|
| * Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+2
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-3/+3
|\|
| * - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-051-3/+3
* | merge v2-prototypeFabio Berger2018-06-063-2/+603
|\|
| * Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2Fabio Berger2018-06-053-2/+603
| |\
| | * revert multisig changeFabio Berger2018-06-051-1/+1
| | * reset multisignFabio Berger2018-06-051-1/+1
| | * Add new 2.0 artifacts to migrationsFabio Berger2018-06-052-0/+601
| | * Remove compact_artifacts and replace with updated artifactsFabio Berger2018-06-051-2/+2
* | | Exclude generate contract wrappers from tslintFabio Berger2018-06-061-1/+1
* | | Try enabling no-unused-variable...fragosti2018-06-053-6/+3
|/ /
* / Update artifacts in migrationsAlex Browne2018-06-058-51/+79
|/
* remove artifactsDir and contracts from compiler.jsonFabio Berger2018-06-021-13/+0
* Remove ISigner artifactFabio Berger2018-06-021-76/+0
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-17/+18
|\
| * Update v2 artifactsFabio Berger2018-06-0217-4493/+4727
| * Add IWallet and IValidator to compiled contractsFabio Berger2018-06-021-2/+2
| * Split migrations compile command into one for V1 and another for V2Fabio Berger2018-06-021-3/+4
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-024-3/+4
|\|
| * Fix linter errorsLeonid Logvinov2018-06-014-3/+4
| * Introduce ethereum-types packageLeonid Logvinov2018-06-013-3/+3
* | Update all artifactsFabio Berger2018-06-018-2233/+2148
* | List V2 contracts in compile.json nowFabio Berger2018-06-011-6/+5
* | Rename ISigner to IWallet and implement SignatureType.ValidatorFabio Berger2018-06-014-2/+151
* | Update artifactsFabio Berger2018-06-0110-2286/+2457
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-011-0/+280
|\|
| * Update WhitelistAmir Bandeali2018-05-311-0/+280
* | Add ISigner artifactsFabio Berger2018-05-311-0/+76
* | Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-302-3/+4
|/
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-252-9/+791
|\
| * Fix buildAmir Bandeali2018-05-252-9/+791
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-259-45/+208
|\ \
| * | Fix a typoLeonid Logvinov2018-05-251-2/+2
| * | Migrate migrations to v2Leonid Logvinov2018-05-259-45/+208
| |/
* / Use domain separator for exchange addressJacob Evans2018-05-252-2292/+2273
|/
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-241-1/+1
|\
| * Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-231-1/+1
| * Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-233-11/+24
| |\
| | * PublishLeonid Logvinov2018-05-231-10/+10
| | * Updated CHANGELOGSLeonid Logvinov2018-05-232-1/+14
* | | PublishLeonid Logvinov2018-05-231-10/+10
* | | Updated CHANGELOGSLeonid Logvinov2018-05-232-1/+14
* | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-232-3/+2
|/ /
* | Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-231-14/+14
|\ \
| * | Update artifactsRemco Bloemen2018-05-221-14/+14
* | | merge developmentFabio Berger2018-05-232-3/+4
|\ \ \ | |/ / |/| / | |/
| * remove generated contract_wrappers during cleanFabio Berger2018-05-231-1/+1
| * Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-231-2/+3
| |\
| | * Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-177-43/+7
| | |\
| | * \ Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-161-0/+3
| | |\ \
| | * | | Fix TSLint rulesFabio Berger2018-05-161-2/+3
* | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2216-289/+637
|\ \ \ \ \
| * | | | | Ran prettierGreg Hysen2018-05-2216-7692/+7892
| * | | | | Added getNullFillResultsGreg Hysen2018-05-192-14/+14
| * | | | | orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-192-20/+20
| * | | | | Style improvements to order matchingGreg Hysen2018-05-191-10/+10
| * | | | | Upgraded to Solidity 0.4.24Greg Hysen2018-05-1910-149/+149
| * | | | | Rebased against v2-prototypeGreg Hysen2018-05-1916-7544/+7692
* | | | | | merge developmentFabio Berger2018-05-221-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | / Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-171-5/+5
| | |_|/ | |/| |
| * | | Improve about page descriptionsfragosti2018-05-176-42/+6
* | | | Fix prettierBrandon Millman2018-05-1916-7343/+7544
* | | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-162-19/+10
|\| | |
| * | | Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
| | |/ | |/|
| * | Merge pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-161-0/+3
| |\ \ | | |/ | |/|
| | * Change minimum Node version to 6.12Alex Browne2018-05-151-1/+1
| | * Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-151-0/+3
| * | Fix abi-gen binary so it can be called directly from packagesFabio Berger2018-05-151-2/+3
| * | Move from using lerna multi-package commands to wsrun, update README's accord...Fabio Berger2018-05-152-16/+4
| |/
* | Do not remove artifacts when running `clean`Fabio Berger2018-05-161-1/+1
generated by cgit (git 2.34.1) at 2024-11-19 05:22:38 +0800