mathieui 
							
						 
					 
					
						
						
							
						
						acc52fd935 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/fritzy/SleekXMPP  into sleek-merge  
						
						... 
						
						
						
						Conflicts:
	README.rst
	examples/IoT_TestDevice.py
	examples/disco_browser.py
	setup.py
	sleekxmpp/jid.py
	sleekxmpp/plugins/google/auth/stanza.py
	sleekxmpp/plugins/google/gmail/notifications.py
	sleekxmpp/plugins/google/nosave/stanza.py
	sleekxmpp/plugins/google/settings/settings.py
	sleekxmpp/thirdparty/__init__.py
	sleekxmpp/thirdparty/socks.py
	sleekxmpp/thirdparty/statemachine.py
	sleekxmpp/util/__init__.py
	sleekxmpp/xmlstream/xmlstream.py
	slixmpp/basexmpp.py
	slixmpp/plugins/xep_0004/stanza/form.py
	slixmpp/plugins/xep_0009/rpc.py
	slixmpp/plugins/xep_0050/adhoc.py
	slixmpp/plugins/xep_0065/proxy.py
	slixmpp/plugins/xep_0084/stanza.py
	slixmpp/plugins/xep_0202/time.py
	slixmpp/plugins/xep_0323/sensordata.py
	slixmpp/plugins/xep_0325/control.py
	slixmpp/plugins/xep_0325/stanza/control.py
	slixmpp/roster/single.py
	slixmpp/stanza/atom.py
	slixmpp/stanza/rootstanza.py
	slixmpp/test/slixtest.py
	slixmpp/util/sasl/mechanisms.py
	slixmpp/version.py
	slixmpp/xmlstream/stanzabase.py
	tests/test_stanza_xep_0323.py
	tests/test_stanza_xep_0325.py
	tests/test_stream_xep_0323.py
	tests/test_stream_xep_0325.py 
						
						
					 
					
						2015-10-02 19:00:19 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						488c433555 
					 
					
						
						
							
							Add SOCKS5 Bytestream examples.  
						
						
						
						
					 
					
						2015-08-23 16:06:01 +01:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						a721084f6e 
					 
					
						
						
							
							Fix the pubsub_client example.  
						
						
						
						
					 
					
						2015-08-08 17:34:06 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						349b05b9b7 
					 
					
						
						
							
							Stop disco_browser and pubsub_client examples once they are finished.  
						
						
						
						
					 
					
						2015-08-08 17:34:06 +02:00 
						 
				 
			
				
					
						
							
							
								elya5 
							
						 
					 
					
						
						
							
						
						edd9199be8 
					 
					
						
						
							
							Fix UnboundlocalError in disco_browser.py example  
						
						... 
						
						
						
						If self.get is in self.info_types and self.items_types, only self['xep_0030'].get_info is executed and not self['xep_0030'].get_items. So the condition in line 129 is successful but items is not assigned. 
						
						
					 
					
						2015-07-09 17:15:36 +02:00 
						 
				 
			
				
					
						
							
							
								Mike Taylor 
							
						 
					 
					
						
						
							
						
						bb094cc649 
					 
					
						
						
							
							Merge pull request  #365  from jdowner/staging  
						
						... 
						
						
						
						Fixed imports 
						
						
					 
					
						2015-07-05 15:46:04 -04:00 
						 
				 
			
				
					
						
							
							
								Steven Roose 
							
						 
					 
					
						
						
							
						
						92901637ec 
					 
					
						
						
							
							Change to roster migration example  
						
						... 
						
						
						
						I did have the chance to test the script yet, but it seems like that line should be outside the for loop. 
						
						
					 
					
						2015-05-25 01:01:08 +02:00 
						 
				 
			
				
					
						
							
							
								Joshua Downer 
							
						 
					 
					
						
						
							
						
						a0c6bf15e9 
					 
					
						
						
							
							Fixed imports  
						
						... 
						
						
						
						Removed unused modules/packages and added getpass, which was missing. 
						
						
					 
					
						2015-05-13 17:24:06 -04:00 
						 
				 
			
				
					
						
							
							
								Sangeeth Saravanaraj 
							
						 
					 
					
						
						
							
						
						80b60fc048 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into xep_0332  
						
						
						
						
					 
					
						2015-04-28 16:53:40 +05:30 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						474405ab90 
					 
					
						
						
							
							XEP-0047: fix examples.  
						
						
						
						
					 
					
						2015-04-19 20:48:02 +02:00 
						 
				 
			
				
					
						
							
							
								Mike Taylor 
							
						 
					 
					
						
						
							
						
						86e85f9835 
					 
					
						
						
							
							Merge pull request  #313  from mayflower/develop  
						
						... 
						
						
						
						Proposing #310  again in fixed version 
						
						
					 
					
						2015-04-11 20:12:19 -04:00 
						 
				 
			
				
					
						
							
							
								Richard Kellner 
							
						 
					 
					
						
						
							
						
						81b7b2c190 
					 
					
						
						
							
							Fixed bug  #353  Python3 XEP-0084 error  
						
						
						
						
					 
					
						2015-03-25 14:04:46 +01:00 
						 
				 
			
				
					
						
							
							
								mathieui 
							
						 
					 
					
						
						
							
						
						83d00a5913 
					 
					
						
						
							
							Fix examples relying on the changed API  
						
						
						
						
					 
					
						2015-02-28 19:02:44 +01:00 
						 
				 
			
				
					
						
							
							
								mathieui 
							
						 
					 
					
						
						
							
						
						c66a4d4097 
					 
					
						
						
							
							Update the documentation and examples  
						
						... 
						
						
						
						- update most of the examples with slixmpp
- change the help channels pointed out in the doc
- add a page listing differences from slixmpp and how to use asyncio
  nicely with slixmpp
- fix some in-code rst documentation 
						
						
					 
					
						2015-02-24 22:47:15 +01:00 
						 
				 
			
				
					
						
							
							
								Sangeeth Saravanaraj 
							
						 
					 
					
						
						
							
						
						9044807121 
					 
					
						
						
							
							Added help for running example..  
						
						
						
						
					 
					
						2015-02-05 18:11:41 +05:30 
						 
				 
			
				
					
						
							
							
								Sangeeth Saravanaraj 
							
						 
					 
					
						
						
							
						
						24264d3a07 
					 
					
						
						
							
							Updated Example..  
						
						
						
						
					 
					
						2015-02-05 18:10:10 +05:30 
						 
				 
			
				
					
						
							
							
								Sangeeth Saravanaraj 
							
						 
					 
					
						
						
							
						
						8afba7de85 
					 
					
						
						
							
							renamed example for convenience.  
						
						
						
						
					 
					
						2015-01-22 16:38:16 +05:30 
						 
				 
			
				
					
						
							
							
								Sangeeth Saravanaraj 
							
						 
					 
					
						
						
							
						
						1ce42d3a2f 
					 
					
						
						
							
							Boilerplate example.  
						
						
						
						
					 
					
						2015-01-22 11:30:38 +05:30 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						7c3e61950d 
					 
					
						
						
							
							Remove all deprecated alias in the core of slixmpp, and wherever they were used.  
						
						
						
						
					 
					
						2014-09-28 23:58:46 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						49beb3ac08 
					 
					
						
						
							
							Don’t set the wait time to True instead of leaving its float default, in examples.  
						
						
						
						
					 
					
						2014-09-28 23:58:46 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						17174016ec 
					 
					
						
						
							
							Remove all trailing whitespaces.  
						
						
						
						
					 
					
						2014-09-01 02:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						8660148960 
					 
					
						
						
							
							Move examples from the deprecated optparse to argparse, and remove the redundant -v option.  
						
						
						
						
					 
					
						2014-09-01 02:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						67ca2dd0f4 
					 
					
						
						
							
							Import getpass from getpass, instead of using getpass.getpass everytime.  
						
						
						
						
					 
					
						2014-09-01 02:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						882f984b26 
					 
					
						
						
							
							Remove (usually) useless comments in examples about OpenFire and how to verify a certificate.  
						
						
						
						
					 
					
						2014-09-01 02:47:15 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						6175cbcd99 
					 
					
						
						
							
							Reintroduce XMLStream.process, making it run the asyncio event loop.  
						
						
						
						
					 
					
						2014-09-01 02:47:08 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						476d76a533 
					 
					
						
						
							
							Remove threaded from examples’ add_event_handler.  
						
						
						
						
					 
					
						2014-09-01 02:42:45 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						df68bb4896 
					 
					
						
						
							
							Remove raw_input usage and other python2 support in examples  
						
						
						
						
					 
					
						2014-09-01 02:42:45 +02:00 
						 
				 
			
				
					
						
							
							
								Emmanuel Gil Peyrot 
							
						 
					 
					
						
						
							
						
						815e647c97 
					 
					
						
						
							
							Set the shebang to python3 everywhere.  
						
						
						
						
					 
					
						2014-09-01 02:42:45 +02:00 
						 
				 
			
				
					
						
							
							
								Robin Gloster 
							
						 
					 
					
						
						
							
						
						afc939708f 
					 
					
						
						
							
							cleanup semicolons, whitespace and mutable default arguments  
						
						
						
						
					 
					
						2014-08-23 12:47:29 +02:00 
						 
				 
			
				
					
						
							
							
								Robin Gloster 
							
						 
					 
					
						
						
							
						
						3dd379cdf1 
					 
					
						
						
							
							Revert "cleanup semicolons, whitespace and mutable default arguments"  
						
						... 
						
						
						
						This reverts commit 7265682a4d 
						
						
					 
					
						2014-08-18 15:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Robin Gloster 
							
						 
					 
					
						
						
							
						
						7265682a4d 
					 
					
						
						
							
							cleanup semicolons, whitespace and mutable default arguments  
						
						
						
						
					 
					
						2014-08-18 00:52:24 +02:00 
						 
				 
			
				
					
						
							
							
								Florent Le Coz 
							
						 
					 
					
						
						
							
						
						373505f483 
					 
					
						
						
							
							Clean a new bunch of stuf  
						
						
						
						
					 
					
						2014-07-21 20:32:09 +02:00 
						 
				 
			
				
					
						
							
							
								Florent Le Coz 
							
						 
					 
					
						
						
							
						
						5ab77c7452 
					 
					
						
						
							
							Rename to slixmpp  
						
						
						
						
					 
					
						2014-07-17 14:19:04 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Ryzhov 
							
						 
					 
					
						
						
							
						
						cebfd84416 
					 
					
						
						
							
							Examples fixes  
						
						
						
						
					 
					
						2014-01-21 16:19:27 +04:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						cd2d25cf87 
					 
					
						
						
							
							Chmod +x examples, and add shebang lines  
						
						
						
						
					 
					
						2013-09-20 11:50:51 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						24c474a9ec 
					 
					
						
						
							
							Merge branch 'xep_0323_325' of git://github.com/joachimlindborg/SleekXMPP into joachimlindborg-xep_0323_325  
						
						... 
						
						
						
						Conflicts:
	sleekxmpp/plugins/__init__.py 
						
						
					 
					
						2013-09-05 16:26:18 -07:00 
						 
				 
			
				
					
						
							
							
								Joachim Lindborg 
							
						 
					 
					
						
						
							
						
						c85f2494a8 
					 
					
						
						
							
							first functional IoT_Test  
						
						
						
						
					 
					
						2013-09-03 22:51:11 +02:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						c0437d2de8 
					 
					
						
						
							
							Add roster migration example  
						
						
						
						
					 
					
						2013-06-22 14:35:00 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						fae39e1ab4 
					 
					
						
						
							
							Fix some errors in the IBB plugin.  
						
						
						
						
					 
					
						2013-03-29 13:16:18 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						82bbe5d1a6 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
						
					 
					
						2013-02-25 09:53:35 -08:00 
						 
				 
			
				
					
						
							
							
								Anton Ryzhov 
							
						 
					 
					
						
						
							
						
						d9906756cf 
					 
					
						
						
							
							Don't use internally deprecated methods  
						
						
						
						
					 
					
						2013-02-22 01:48:03 +04:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						9a6bfc6614 
					 
					
						
						
							
							Enable force_registration in the register account example.  
						
						
						
						
					 
					
						2013-02-08 09:44:39 -08:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						79914fb56b 
					 
					
						
						
							
							Add option to XEP-0077 plugin to force registration attempts.  
						
						
						
						
					 
					
						2013-02-08 09:36:51 -08:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						3423589ba1 
					 
					
						
						
							
							Updated XEP-0199 to take and return standardized values.  
						
						... 
						
						
						
						Handles Iq errors appropriately when the recipient can't be found. 
						
						
					 
					
						2013-01-20 20:14:16 -08:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						12e8bb6ddc 
					 
					
						
						
							
							Turns out not all data is UTF-8, so don't try to decode it.  
						
						... 
						
						
						
						Fixes issue #204  
						
						
					 
					
						2012-10-31 00:16:58 -07:00 
						 
				 
			
				
					
						
							
							
								Paul Molodowitch 
							
						 
					 
					
						
						
							
						
						52feabbe76 
					 
					
						
						
							
							added setdefaultencoding method so reload(sys) not needed  
						
						... 
						
						
						
						reload(sys) could cause problem in user code - ie, sys.stdout, excepthook, and displayhook would be reset, etc 
						
						
					 
					
						2012-10-24 13:06:36 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						295d23ccf3 
					 
					
						
						
							
							Fix disco browser example to handle errors.  
						
						
						
						
					 
					
						2012-08-07 16:44:52 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						26dc6e90ea 
					 
					
						
						
							
							Add example for setting an avatar.  
						
						
						
						
					 
					
						2012-07-25 01:37:03 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						fb221a8dc0 
					 
					
						
						
							
							Add XEP-0133 support, which just makes the appropriate XEP-0050 calls.  
						
						
						
						
					 
					
						2012-07-22 13:58:23 -07:00 
						 
				 
			
				
					
						
							
							
								Lance Stout 
							
						 
					 
					
						
						
							
						
						474390fa00 
					 
					
						
						
							
							Add example for retrieving avatars.  
						
						
						
						
					 
					
						2012-07-20 18:10:14 -07:00