Fabio Berger 
							
						 
					 
					
						
						
							
						
						cd5f00ac4d 
					 
					
						
						
							
							Merge branch 'development' into breakUp0xjs  
						
						 
						
						... 
						
						
						
						* development: (38 commits)
  Add fallback image support to relayer grid tile
  Clear relayer grid state when fetching
  Configure the compiler to generate artifacts with deployedBytecode
  Implement loading and error state for relayer grid
  Fallback image for relayer grid tile
  Change relayer grid tile to link on header
  Display top tokens from backend
  Remove overflowZ property from portal
  Suggestions and fix bad merge
  Fix typo
  Only show untracked tokens
  Make wallet scrollable
  Add token flow
  Update The Ocean logo
  Fix artifacts paths
  Create an artifacts folder
  Introduce a var
  Add removeHexPrefix util method
  CHeck if ABI exists
  Improve the readability of the check for should compile
  ...
# Conflicts:
#	.gitignore
#	packages/contracts/test/multi_sig_with_time_lock.ts
#	packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts
#	packages/contracts/util/artifacts.ts 
						
						
					 
					
						2018-05-10 17:08:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						eeb08b7fae 
					 
					
						
						
							
							Fix type error for latched on property  
						
						 
						
						
						
						
					 
					
						2018-05-10 16:53:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						c6882d0bd8 
					 
					
						
						
							
							Rename zeroExContract... to contractWrappers...  
						
						 
						
						
						
						
					 
					
						2018-05-10 16:51:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						7b726650e9 
					 
					
						
						
							
							Improve createOrderWatcherAsync  
						
						 
						
						
						
						
					 
					
						2018-05-10 14:59:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						d3adb48c2e 
					 
					
						
						
							
							Fix no-any-propagation  
						
						 
						
						
						
						
					 
					
						2018-05-10 14:59:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						9838124abc 
					 
					
						
						
							
							Remove unnecessary tslint config  
						
						 
						
						
						
						
					 
					
						2018-05-10 14:59:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						4df847c349 
					 
					
						
						
							
							Add pr number to changelogs  
						
						 
						
						
						
						
					 
					
						2018-05-10 14:58:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						017b5a23d8 
					 
					
						
						
							
							Fix website and 0x.js docs  
						
						 
						
						
						
						
					 
					
						2018-05-09 23:26:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						209266dbed 
					 
					
						
						
							
							Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifying library with the same interface  
						
						 
						
						
						
						
					 
					
						2018-05-09 20:36:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						27262c4e56 
					 
					
						
						
							
							Move artifacts from src/artifacts to artifacts/v1  
						
						 
						
						
						
						
					 
					
						2018-05-07 13:32:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						69a6166b6a 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.37 .2
 - @0xproject/abi-gen@0.2.13
 - @0xproject/assert@0.2.9
 - @0xproject/base-contract@0.3.1
 - @0xproject/connect@0.6.12
 - contracts@2.1.28
 - @0xproject/deployer@0.4.3
 - @0xproject/dev-utils@0.4.1
 - @0xproject/json-schemas@0.7.23
 - @0xproject/metacoin@0.0.6
 - @0xproject/migrations@0.0.5
 - @0xproject/order-utils@0.0.4
 - @0xproject/react-docs-example@0.0.11
 - @0xproject/react-docs@0.0.11
 - @0xproject/react-shared@0.1.6
 - @0xproject/sol-cov@0.0.10
 - @0xproject/sol-resolver@0.0.4
 - @0xproject/sra-report@0.0.14
 - @0xproject/subproviders@0.10 .1
 - @0xproject/testnet-faucets@1.0.29
 - @0xproject/types@0.6.3
 - @0xproject/typescript-typings@0.3.1
 - @0xproject/utils@0.6.1
 - @0xproject/web3-wrapper@0.6.3
 - @0xproject/website@0.0.32 
						
						
					 
					
						2018-05-05 01:55:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						bf87b1a6af 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-05-05 01:55:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						b4cb21b55e 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.37 .1
 - contracts@2.1.27
 - @0xproject/order-utils@0.0.3
 - @0xproject/sra-report@0.0.13
 - @0xproject/testnet-faucets@1.0.28
 - @0xproject/website@0.0.30 
						
						
					 
					
						2018-05-04 20:44:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						ae68c3abe4 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-05-04 20:44:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						8dd9124863 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.37 .0
 - @0xproject/abi-gen@0.2.12
 - @0xproject/assert@0.2.8
 - @0xproject/base-contract@0.3.0
 - @0xproject/connect@0.6.11
 - contracts@2.1.26
 - @0xproject/deployer@0.4.2
 - @0xproject/dev-utils@0.4.0
 - @0xproject/json-schemas@0.7.22
 - @0xproject/metacoin@0.0.5
 - @0xproject/migrations@0.0.4
 - @0xproject/monorepo-scripts@0.1.19
 - @0xproject/order-utils@0.0.2
 - @0xproject/react-docs-example@0.0.9
 - @0xproject/react-docs@0.0.9
 - @0xproject/react-shared@0.1.4
 - @0xproject/sol-cov@0.0.9
 - @0xproject/sol-resolver@0.0.3
 - @0xproject/sra-report@0.0.12
 - @0xproject/subproviders@0.10 .0
 - @0xproject/testnet-faucets@1.0.27
 - @0xproject/tslint-config@0.4.17
 - @0xproject/types@0.6.2
 - @0xproject/typescript-typings@0.3.0
 - @0xproject/utils@0.6.0
 - @0xproject/web3-wrapper@0.6.2
 - @0xproject/website@0.0.29 
						
						
					 
					
						2018-05-04 12:16:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						3fc99dbad5 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-05-04 12:16:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						01dd84dced 
					 
					
						
						
							
							Add order utils docs to the menu  
						
						 
						
						
						
						
					 
					
						2018-05-04 12:09:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						a6046af024 
					 
					
						
						
							
							Stop exporting assertions from order-utils  
						
						 
						
						
						
						
					 
					
						2018-05-02 18:38:50 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						adaff92c92 
					 
					
						
						
							
							Create wrapper functions so that docs render properly  
						
						 
						
						
						
						
					 
					
						2018-05-02 16:01:01 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						0499541e11 
					 
					
						
						
							
							Move order utils to @0xproject/order-utils  
						
						 
						
						
						
						
					 
					
						2018-05-02 15:10:24 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						8e7937bdb6 
					 
					
						
						
							
							Update comment to be more descriptive of null address in exchange simulator  
						
						 
						
						
						
						
					 
					
						2018-05-01 19:06:17 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						b36587fac8 
					 
					
						
						
							
							Execute taker side in trade simulation  
						
						 
						
						... 
						
						
						
						Fill if the taker address is open 
						
						
					 
					
						2018-05-01 14:43:47 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						e1cab78c09 
					 
					
						
						
							
							Remove remenants of MaliciousToken contract  
						
						 
						
						
						
						
					 
					
						2018-04-26 10:06:32 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						5682cd0048 
					 
					
						
						
							
							Update Web3 Provider Engine to 14.0.4  
						
						 
						
						
						
						
					 
					
						2018-04-24 14:33:32 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						0e3544e1f9 
					 
					
						
						
							
							Miscellaneous style changes to the contracts package; specifically tests  
						
						 
						
						
						
						
					 
					
						2018-04-20 13:56:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Greg Hysen 
							
						 
					 
					
						
						
							
						
						2a8fc705c7 
					 
					
						
						
							
							Commented out 0x.js tests until migration package is ready.  
						
						 
						
						
						
						
					 
					
						2018-04-20 13:56:18 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						62a55c0135 
					 
					
						
						
							
							Merge pull request  #540  from 0xProject/feature/abi-gen/tuple-return-types  
						
						 
						
						... 
						
						
						
						Support Tuples returned from functions 
						
						
					 
					
						2018-04-20 08:49:23 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						b264bbea84 
					 
					
						
						
							
							Update 0x.js package json for ethers  
						
						 
						
						
						
						
					 
					
						2018-04-19 14:57:14 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						d1d26f8bf6 
					 
					
						
						
							
							Merge branch 'development' into fix/expiration-watcher  
						
						 
						
						... 
						
						
						
						* development:
  Publish
  Updated CHANGELOGS
  Move @0xproject/migrations to devDependencies
  Publish
  Updated CHANGELOGS
  Make @0xproject/migrations public
# Conflicts:
#	packages/0x.js/CHANGELOG.json
#	packages/0x.js/package.json 
						
						
					 
					
						2018-04-19 10:38:43 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						1ca86730fa 
					 
					
						
						
							
							Remove hack above migrations package  
						
						 
						
						
						
						
					 
					
						2018-04-19 10:37:13 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						62fcb51e1a 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.36 .3
 - contracts@2.1.25
 - @0xproject/sra-report@0.0.11
 - @0xproject/testnet-faucets@1.0.26
 - @0xproject/website@0.0.28 
						
						
					 
					
						2018-04-18 21:30:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						cbc55f2ef8 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-04-18 21:30:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						679f828e4e 
					 
					
						
						
							
							Move @0xproject/migrations to devDependencies  
						
						 
						
						
						
						
					 
					
						2018-04-18 21:18:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						4a8b4e7398 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.36 .2
 - contracts@2.1.24
 - @0xproject/migrations@0.0.3
 - @0xproject/sra-report@0.0.10
 - @0xproject/testnet-faucets@1.0.25
 - @0xproject/website@0.0.27 
						
						
					 
					
						2018-04-18 19:57:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						b6a11ca31e 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-04-18 19:57:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						a30ccf2b25 
					 
					
						
						
							
							Make @0xproject/migrations public  
						
						 
						
						
						
						
					 
					
						2018-04-18 19:32:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leonid Logvinov 
							
						 
					 
					
						
						
							
						
						2574405699 
					 
					
						
						
							
							Fix expiration watcher comparator  
						
						 
						
						
						
						
					 
					
						2018-04-18 13:45:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						3ba78553f0 
					 
					
						
						
							
							Publish  
						
						 
						
						... 
						
						
						
						- 0x.js@0.36 .1
 - @0xproject/abi-gen@0.2.11
 - @0xproject/assert@0.2.7
 - @0xproject/base-contract@0.2.1
 - @0xproject/connect@0.6.10
 - contracts@2.1.23
 - @0xproject/deployer@0.4.1
 - @0xproject/dev-utils@0.3.6
 - @0xproject/json-schemas@0.7.21
 - @0xproject/metacoin@0.0.4
 - @0xproject/migrations@0.0.2
 - @0xproject/monorepo-scripts@0.1.18
 - @0xproject/react-docs-example@0.0.8
 - @0xproject/react-docs@0.0.8
 - @0xproject/react-shared@0.1.3
 - @0xproject/sol-cov@0.0.8
 - @0xproject/sol-resolver@0.0.2
 - @0xproject/sra-report@0.0.9
 - @0xproject/subproviders@0.9.0
 - @0xproject/testnet-faucets@1.0.24
 - @0xproject/tslint-config@0.4.16
 - @0xproject/types@0.6.1
 - @0xproject/typescript-typings@0.2.0
 - @0xproject/utils@0.5.2
 - @0xproject/web3-wrapper@0.6.1
 - @0xproject/website@0.0.26 
						
						
					 
					
						2018-04-18 20:16:29 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						85f28ade86 
					 
					
						
						
							
							Updated CHANGELOGS  
						
						 
						
						
						
						
					 
					
						2018-04-18 18:36:11 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						f6f2991a44 
					 
					
						
						
							
							Merge pull request  #535  from 0xProject/fix/commentRendering  
						
						 
						
						... 
						
						
						
						Docs: Fix Type Comment Rendering 
						
						
					 
					
						2018-04-18 18:19:27 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						64c5c5eb40 
					 
					
						
						
							
							Fix comments  
						
						 
						
						
						
						
					 
					
						2018-04-18 15:22:20 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						1a161cc02e 
					 
					
						
						
							
							Fix linter and prettier  
						
						 
						
						
						
						
					 
					
						2018-04-18 11:24:59 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ara Kevonian 
							
						 
					 
					
						
						
							
						
						3ffcb03d87 
					 
					
						
						
							
							Update CHANGELOG  
						
						 
						
						
						
						
					 
					
						2018-04-17 08:03:07 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ara Kevonian 
							
						 
					 
					
						
						
							
						
						33b08b90a3 
					 
					
						
						
							
							Revert removeOrder flag in favor of noop  
						
						 
						
						
						
						
					 
					
						2018-04-17 07:42:43 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ara Kevonian 
							
						 
					 
					
						
						
							
						
						cbca2061f7 
					 
					
						
						
							
							Fix redundant expired order removal bug  
						
						 
						
						
						
						
					 
					
						2018-04-17 07:25:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fabio Berger 
							
						 
					 
					
						
						
							
						
						bf4873e519 
					 
					
						
						
							
							Merge pull request  #510  from avonian/development  
						
						 
						
						... 
						
						
						
						Implement `zeroEx.exchange.getOrderStateAsync` 
						
						
					 
					
						2018-04-17 23:09:05 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ara Kevonian 
							
						 
					 
					
						
						
							
						
						8fc1b38ff2 
					 
					
						
						
							
							Use this.defaultBlock in OrderFilledCancelledLazyStore  
						
						 
						
						
						
						
					 
					
						2018-04-17 06:51:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ara Kevonian 
							
						 
					 
					
						
						
							
						
						7d957538b4 
					 
					
						
						
							
							Add stateLayer param to getOrderState and clean up variable names  
						
						 
						
						
						
						
					 
					
						2018-04-17 06:47:36 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						0d02037a12 
					 
					
						
						
							
							Change changelog note as it has no public impact  
						
						 
						
						
						
						
					 
					
						2018-04-17 13:41:45 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob Evans 
							
						 
					 
					
						
						
							
						
						bc3c7a30c4 
					 
					
						
						
							
							Prettier on CHANGELOG.json  
						
						 
						
						
						
						
					 
					
						2018-04-14 13:33:06 +10:00