Leif Uwe Vogelsang 
							
						 
					 
					
						
						
						
						
							
						
						
							538a8d6b12 
							
						 
					 
					
						
						
							
							Resolved merge conflict by incorporating both suggestions.  
						
						
						
					 
					
						2017-04-19 21:06:07 +02:00 
						 
				 
			
				
					
						
							
							
								Leif Uwe Vogelsang 
							
						 
					 
					
						
						
						
						
							
						
						
							e821c48489 
							
						 
					 
					
						
						
							
							Norwegian language basics  
						
						
						
					 
					
						2017-04-19 21:04:01 +02:00 
						 
				 
			
				
					
						
							
							
								luvogels 
							
						 
					 
					
						
						
						
						
							
						
						
							ff900ffd7c 
							
						 
					 
					
						
						
							
							Update setup.py  
						
						... 
						
						
						
						added nb 
						
					 
					
						2017-04-19 21:02:26 +02:00 
						 
				 
			
				
					
						
							
							
								Leif Uwe Vogelsang 
							
						 
					 
					
						
						
						
						
							
						
						
							3796c668d9 
							
						 
					 
					
						
						
							
							more norwegian  
						
						
						
					 
					
						2017-04-19 21:01:32 +02:00 
						 
				 
			
				
					
						
							
							
								Leif Uwe Vogelsang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc9557b21f 
							
						 
					 
					
						
						
							
							Norwegian language basics  
						
						
						
					 
					
						2017-04-19 21:00:01 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd89e7ade 
							
						 
					 
					
						
						
							
							Tidy up Hebrew tests and test for punctuation (see  #995 )  
						
						
						
					 
					
						2017-04-19 19:28:03 +02:00 
						 
				 
			
				
					
						
							
							
								Ines Montani 
							
						 
					 
					
						
						
						
						
							
						
						
							275fc9f78a 
							
						 
					 
					
						
						
							
							Update CONTRIBUTING.md  
						
						
						
					 
					
						2017-04-19 12:09:10 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							b763e9b66d 
							
						 
					 
					
						
						
							
							Add note about variable naming  
						
						
						
					 
					
						2017-04-19 12:00:12 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							48da244058 
							
						 
					 
					
						
						
							
							Use spacy.compat.json_dumps for Python 2/3 compatibility ( resolves   #991 )  
						
						
						
					 
					
						2017-04-19 11:50:36 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							0605b95f2e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/explosion/spaCy  
						
						
						
					 
					
						2017-04-18 13:48:00 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							2f84626417 
							
						 
					 
					
						
						
							
							Fix train_new_entity_type example  
						
						
						
					 
					
						2017-04-18 13:47:36 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							ddd5194088 
							
						 
					 
					
						
						
							
							Update Language docs and docstrings  
						
						
						
					 
					
						2017-04-17 01:52:13 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							f62b740961 
							
						 
					 
					
						
						
							
							Use compat.json_dumps  
						
						
						
					 
					
						2017-04-17 01:46:14 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab394d655 
							
						 
					 
					
						
						
							
							Fix whitespace  
						
						
						
					 
					
						2017-04-17 01:45:00 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							7f776258f0 
							
						 
					 
					
						
						
							
							Add link to API docs  
						
						
						
					 
					
						2017-04-17 01:41:46 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							aad80a291f 
							
						 
					 
					
						
						
							
							Add save_to_directory method to API docs  
						
						
						
					 
					
						2017-04-17 01:40:34 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							8e83f8e2fa 
							
						 
					 
					
						
						
							
							Update docstrings  
						
						
						
					 
					
						2017-04-17 01:40:26 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							e2299dc389 
							
						 
					 
					
						
						
							
							Ensure path in save_to_directory  
						
						
						
					 
					
						2017-04-17 01:40:14 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							01067e99d4 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
					 
					
						2017-04-17 01:30:10 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							82f5f1f98f 
							
						 
					 
					
						
						
							
							Replace str with compat.unicode_  
						
						
						
					 
					
						2017-04-17 01:29:54 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							ad74245be9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						
						
					 
					
						2017-04-17 01:08:11 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							c6c3162c50 
							
						 
					 
					
						
						
							
							Fix lightning tour example ( closes   #889 )  
						
						
						
					 
					
						2017-04-17 00:00:30 +02:00 
						 
				 
			
				
					
						
							
							
								Ines Montani 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ae3b7cc2 
							
						 
					 
					
						
						
							
							Fix formatting and typo ( closes   #967 )  
						
						
						
					 
					
						2017-04-16 23:56:12 +02:00 
						 
				 
			
				
					
						
							
							
								Ines Montani 
							
						 
					 
					
						
						
						
						
							
						
						
							734b0a4e4a 
							
						 
					 
					
						
						
							
							Update train_new_entity_type.py  
						
						
						
					 
					
						2017-04-16 23:42:16 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							cffaf52152 
							
						 
					 
					
						
						
							
							Update README.rst  
						
						
						
					 
					
						2017-04-16 23:34:14 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							db7e046faa 
							
						 
					 
					
						
						
							
							Update version  
						
						
						
					 
					
						2017-04-16 23:23:59 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							02e7512b91 
							
						 
					 
					
						
						
							
							Increment version  
						
						
						
					 
					
						2017-04-16 22:39:58 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							16a8521efa 
							
						 
					 
					
						
						
							
							Increment version  
						
						
						
					 
					
						2017-04-16 22:38:38 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							de5062711b 
							
						 
					 
					
						
						
							
							Update adding languages workflow to reflect changes in __init__.py  
						
						
						
					 
					
						2017-04-16 22:26:46 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							4efd6fb9d6 
							
						 
					 
					
						
						
							
							Fix training  
						
						
						
					 
					
						2017-04-16 15:28:27 -05:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							17c9fffb9e 
							
						 
					 
					
						
						
							
							Fix naked except  
						
						
						
					 
					
						2017-04-16 15:28:16 -05:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							5610fdcc06 
							
						 
					 
					
						
						
							
							Get language name first if no model path exists  
						
						... 
						
						
						
						Makes sure spaCy fails early if no tokenizer exists, and allows
printing better error message. 
						
					 
					
						2017-04-16 22:16:47 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							ad168ba88c 
							
						 
					 
					
						
						
							
							Set model name to empty string if path override exists  
						
						... 
						
						
						
						Required for parse_package_meta, which composes path of data_path and
model_name (needs to be fixed in the future) 
						
					 
					
						2017-04-16 22:15:51 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							97647c46cd 
							
						 
					 
					
						
						
							
							Add docstring and todo note  
						
						
						
					 
					
						2017-04-16 22:14:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							5c5f8c0a72 
							
						 
					 
					
						
						
							
							Check if full string is found in lang classes first  
						
						... 
						
						
						
						This allows users to set arbitrary strings. (Otherwise, custom lang
class "my_custom_class" would always load Burmese "my" tokenizer if one
was available.) 
						
					 
					
						2017-04-16 22:14:38 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							13d30b6c01 
							
						 
					 
					
						
						
							
							xfail lemmatizer test that's causing problems (see  #546 )  
						
						
						
					 
					
						2017-04-16 21:18:39 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							4931c56afc 
							
						 
					 
					
						
						
							
							Increment version  
						
						
						
					 
					
						2017-04-16 13:59:38 -05:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							6145b7c153 
							
						 
					 
					
						
						
							
							Remove redundant Path  
						
						
						
					 
					
						2017-04-16 20:53:25 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Honnibal 
							
						 
					 
					
						
						
						
						
							
						
						
							fa89613444 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/explosion/spaCy  
						
						
						
					 
					
						2017-04-16 13:42:56 -05:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							264af6cd17 
							
						 
					 
					
						
						
							
							Add documentation  
						
						
						
					 
					
						2017-04-16 20:37:46 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							e4dd645c37 
							
						 
					 
					
						
						
							
							Update link  
						
						
						
					 
					
						2017-04-16 20:37:46 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							dea79224ed 
							
						 
					 
					
						
						
							
							Remove saving & loading docs and link to new workflow  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							c365795bf6 
							
						 
					 
					
						
						
							
							Update navigation  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							5bbbb7674b 
							
						 
					 
					
						
						
							
							Add training examples to tutorials  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							17e9743388 
							
						 
					 
					
						
						
							
							Add saving & loading models docs  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							b15bdb5279 
							
						 
					 
					
						
						
							
							Update training docs  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb17b9f33 
							
						 
					 
					
						
						
							
							Add NER training docs  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9f867c70 
							
						 
					 
					
						
						
							
							Remove unused util function  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							7670c745b6 
							
						 
					 
					
						
						
							
							Update spacy.load() and fix path checks  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								ines 
							
						 
					 
					
						
						
						
						
							
						
						
							d3759dfb32 
							
						 
					 
					
						
						
							
							Fix docstring  
						
						
						
					 
					
						2017-04-16 20:37:45 +02:00