=
							
						 
						
							 
							
							
							
								
							
								ba6fa595c6 
								
							
								 
							
						 
						
							
							
								
								WIP - finding more issues with allowing dicts as filters  
							
							 
							
							
							
						 
						
							2018-04-11 20:54:16 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								27647091a5 
								
							
								 
							
						 
						
							
							
								
								WIP - just at stash point  
							
							 
							
							
							
						 
						
							2018-04-11 13:36:52 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								e92db2417a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #147  from oasis-open/119-taxii-filters  
							
							 
							
							... 
							
							
							
							119 taxii filters 
							
						 
						
							2018-03-28 15:24:28 -05:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								51dcd6c184 
								
							
								 
							
						 
						
							
							
								
								same as last commit  
							
							 
							
							
							
						 
						
							2018-03-22 11:46:49 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								b1579ae265 
								
							
								 
							
						 
						
							
							
								
								same as last commit  
							
							 
							
							
							
						 
						
							2018-03-22 11:36:35 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								9f19245c8a 
								
							
								 
							
						 
						
							
							
								
								modify tests for python 3.x acceptance  
							
							 
							
							
							
						 
						
							2018-03-22 11:23:48 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								536e56836c 
								
							
								 
							
						 
						
							
							
								
								adding Filter check when the Filter property is 'type', checks the value has no underscores (issue  #136 )  
							
							 
							
							
							
						 
						
							2018-03-22 10:59:07 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								369eb604ef 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #146  from oasis-open/mbastian1135-patch-1  
							
							 
							
							... 
							
							
							
							remove debug line 
							
						 
						
							2018-03-22 07:55:53 -05:00  
						
					 
				
					
						
							
							
								 
								Michael K
							
						 
						
							 
							
							
								
								
							
							
								
							
								383bf5755e 
								
									
								
							
								 
							
						 
						
							
							
								
								remove debug line  
							
							 
							
							
							
						 
						
							2018-03-21 22:06:46 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								7880e4a89b 
								
							
								 
							
						 
						
							
							
								
								passing TAXII query params in correct format to taxii2client; patching bug where TAXII query filters were being applied again locally to STIX objects via Filters (which doesnt work)  
							
							 
							
							
							
						 
						
							2018-03-21 17:19:05 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								3c2d877bc3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #145  from oasis-open/138-non-json-files  
							
							 
							
							... 
							
							
							
							138 non json files 
							
						 
						
							2018-03-21 13:37:27 -05:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								33cfc4bb27 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #143  from emmanvg/issue-134  
							
							 
							
							... 
							
							
							
							Update TAXIICollectionSink.add() to use serialize() 
							
						 
						
							2018-03-20 08:52:53 -05:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								eeb34ebbef 
								
							
								 
							
						 
						
							
							
								
								Change logic for case `isinstance(stix_data, list)``  
							
							 
							
							
							
						 
						
							2018-03-19 12:03:25 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								32cb62cca2 
								
							
								 
							
						 
						
							
							
								
								Make sure we return if there is nothing to add to the collection  
							
							 
							
							
							
						 
						
							2018-03-19 11:00:09 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								8248fa4859 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #144  from oasis-open/docs  
							
							 
							
							... 
							
							
							
							Tweak property autodocumenter 
							
						 
						
							2018-03-16 15:29:36 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								198b4ecffa 
								
							
								 
							
						 
						
							
							
								
								Tweak property autodocumenter  
							
							 
							
							... 
							
							
							
							- Skip the 'type' property, since it shouldn't be overridden.
- Add info on default values (currently this is only used for timestamp
properties, setting them to the current time).
- Rename it to STIXPropertyDocumenter since they're called properties in
STIX instead of attributes. 
							
						 
						
							2018-03-16 16:14:21 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								c98abb18f5 
								
							
								 
							
						 
						
							
							
								
								Fix docs  
							
							 
							
							
							
						 
						
							2018-03-16 14:26:41 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								740debe7dd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:oasis-open/cti-python-stix2 into issue-134  
							
							 
							
							
							
						 
						
							2018-03-16 13:58:56 -04:00  
						
					 
				
					
						
							
							
								 
								Michael K
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f5876d420 
								
									
								
							
								 
							
						 
						
							
							
								
								Undo last commit  
							
							 
							
							... 
							
							
							
							Removing directive that is not needed, test packages are already excluded correctly. 
							
						 
						
							2018-03-16 10:57:31 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								bc72f93424 
								
							
								 
							
						 
						
							
							
								
								Add warning about TAXIICollection bug  
							
							 
							
							... 
							
							
							
							Related: #125 . 
							
						 
						
							2018-03-15 18:07:14 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								017df285f9 
								
							
								 
							
						 
						
							
							
								
								so pip installs will not include test data directory  
							
							 
							
							
							
						 
						
							2018-03-15 16:11:22 -04:00  
						
					 
				
					
						
							
							
								 
								Emmanuelle Vargas-Gonzalez
							
						 
						
							 
							
							
							
								
							
								7f9a3c49ea 
								
							
								 
							
						 
						
							
							
								
								Update TAXIICollectionSink.add() to use serialize(). Call parse() on dict objects. Pass UTF-8 strings to taxii2client.  closes   #134  
							
							 
							
							
							
						 
						
							2018-03-15 13:51:47 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								2fbde05e6c 
								
							
								 
							
						 
						
							
							
								
								putting test files in stix type folder that exists on git (bc there are files in it)  
							
							 
							
							
							
						 
						
							2018-03-14 19:34:07 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								f4558c0958 
								
							
								 
							
						 
						
							
							
								
								pre-commit errors  
							
							 
							
							
							
						 
						
							2018-03-14 19:09:25 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								6f762e7ea0 
								
							
								 
							
						 
						
							
							
								
								woops forgot file, recommit of: more type checking of filesystem json files; added corresponding tests  
							
							 
							
							
							
						 
						
							2018-03-14 16:32:31 -04:00  
						
					 
				
					
						
							
							
								 
								=
							
						 
						
							 
							
							
							
								
							
								af14cd4f88 
								
							
								 
							
						 
						
							
							
								
								more type checking of filesystem json files; added corresponding tests  
							
							 
							
							
							
						 
						
							2018-03-14 16:28:44 -04:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
							
								
							
								5820fa0845 
								
							
								 
							
						 
						
							
							
								
								GH-138: ignore invalid JSON files.  
							
							 
							
							
							
						 
						
							2018-03-14 10:06:23 -05:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								bf233895ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #142  from oasis-open/docs  
							
							 
							
							... 
							
							
							
							Clarify serialization in documentation 
							
						 
						
							2018-03-14 09:51:12 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								955cad8385 
								
							
								 
							
						 
						
							
							
								
								Clarify serialization in documentation  
							
							 
							
							
							
						 
						
							2018-03-13 16:01:42 -04:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								f9523f24bf 
								
							
								 
							
						 
						
							
							
								
								Bump version: 0.5.0 → 0.5.1  
							
							 
							
							
							
						 
						
							2018-03-06 12:05:53 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								b613e2a66f 
								
							
								 
							
						 
						
							
							
								
								Update CHANGELOG for v0.5.1  
							
							 
							
							
							
						 
						
							2018-03-06 12:05:25 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								35679e6a6b 
								
							
								 
							
						 
						
							
							
								
								Bump version: 0.4.0 → 0.5.0  
							
							 
							
							
							
						 
						
							2018-03-06 11:45:06 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								0e70e61451 
								
							
								 
							
						 
						
							
							
								
								Update CHANGELOG for v0.5.0  
							
							 
							
							
							
						 
						
							2018-03-06 11:44:49 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								1e80086bdd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #133  from oasis-open/126-assume_allow_custom  
							
							 
							
							... 
							
							
							
							Fix allow_custom in functions that call new_version() 
							
						 
						
							2018-03-06 09:51:58 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								5a71ef2e64 
								
							
								 
							
						 
						
							
							
								
								Fix allow_custom in functions calling new_version  
							
							 
							
							
							
						 
						
							2018-03-02 11:32:07 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								1eab9b2832 
								
							
								 
							
						 
						
							
							
								
								Assume custom properties allowable in add_markings  
							
							 
							
							
							
						 
						
							2018-03-02 10:21:51 -05:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								4a9c38e0b5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #132  from oasis-open/114-116-datastore-renaming  
							
							 
							
							... 
							
							
							
							Renaming "sources" and "DataStore" 
							
						 
						
							2018-03-01 13:15:34 -06:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
							
								
							
								307a85c8b1 
								
							
								 
							
						 
						
							
							
								
								Reorder modules for API documentation  
							
							 
							
							
							
						 
						
							2018-03-01 13:15:02 -06:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								eb2d87ce71 
								
							
								 
							
						 
						
							
							
								
								Rename "DataStore" class to "DataStoreMixin"  
							
							 
							
							... 
							
							
							
							Fix  #116 . 
							
						 
						
							2018-03-01 11:27:37 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								5f703509be 
								
							
								 
							
						 
						
							
							
								
								Rename "sources" subpackage to "datastore"  
							
							 
							
							... 
							
							
							
							Fix  #114 . 
							
						 
						
							2018-03-01 09:04:42 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
								
								
							
							
								
							
								9402cff110 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #131  from oasis-open/taxii_collection_source_404  
							
							 
							
							... 
							
							
							
							Data source/store/sink changes 
							
						 
						
							2018-02-27 17:04:14 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								b6f14cdd4d 
								
							
								 
							
						 
						
							
							
								
								Fix MemoryStore docstrings  
							
							 
							
							
							
						 
						
							2018-02-27 16:53:05 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								7bdf786f89 
								
							
								 
							
						 
						
							
							
								
								Remove deprecated tests  
							
							 
							
							
							
						 
						
							2018-02-27 12:17:26 -05:00  
						
					 
				
					
						
							
							
								 
								Greg Back
							
						 
						
							 
							
							
								
								
							
							
								
							
								554cd081b2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #128  from oasis-open/120-attributes_atuodoc  
							
							 
							
							... 
							
							
							
							GH-120 Attributes Autodoc 
							
						 
						
							2018-02-27 10:24:57 -06:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								57eb709c48 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into taxii_collection_source_404  
							
							 
							
							
							
						 
						
							2018-02-26 17:08:28 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								df57f4d159 
								
							
								 
							
						 
						
							
							
								
								Fix typos in datasources  
							
							 
							
							
							
						 
						
							2018-02-26 16:56:24 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								e23d937204 
								
							
								 
							
						 
						
							
							
								
								Fix isort  
							
							 
							
							
							
						 
						
							2018-02-23 09:37:14 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								aaff2a3a04 
								
							
								 
							
						 
						
							
							
								
								Appease pycodestyle  
							
							 
							
							
							
						 
						
							2018-02-22 09:55:15 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								2886ae9961 
								
							
								 
							
						 
						
							
							
								
								Add links to specs in STIX Objects' documentation  
							
							 
							
							
							
						 
						
							2018-02-21 16:46:13 -05:00  
						
					 
				
					
						
							
							
								 
								Chris Lenk
							
						 
						
							 
							
							
							
								
							
								6f35978ba6 
								
							
								 
							
						 
						
							
							
								
								Document STIX object properties' metadata  
							
							 
							
							... 
							
							
							
							(i.e. property type, whether it is required) 
							
						 
						
							2018-02-21 16:46:13 -05:00