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
Sangeeth Saravanaraj
61127f521d
Added PyCharm's .idea folder to .gitignore
2015-01-22 11:09:47 +05:30
Florent Le Coz
5ab77c7452
Rename to slixmpp
2014-07-17 14:19:04 +02:00
Lance Stout
ad7a57103d
ElementTree._escape_cdata isn't reliable across Python versions.
...
It also does not work as desired.
Revert "Merge pull request #254 from barreverte/develop"
This reverts commit 23750357e207284f380f
2013-09-12 10:39:10 -07:00
Jean-Philippe Caruana
db0ab9a0b3
.gitignore: idea
2013-07-29 12:22:10 +02:00
Lance Stout
3c3cd65235
Update gitignore
2013-04-01 22:43:26 -07:00
Sandro Munda
d444930494
Improved the gitignore files (vim temp file, .pyo file and .baboon directory).
...
Automatically pack & unpack data through the socket.
Added some comments to the pack method.
Handled possible error during the unpacking of data.
2012-11-01 11:17:05 +01:00
Sandro Munda
40ef4a16b1
Updated the .gitignore to add .ropeproject/ folder
2012-06-07 18:38:56 +02:00
Lance Stout
8f25acd0f3
Bump version number in develop branch to 1.0.1dev.
2012-01-25 20:44:41 -08:00
Lance Stout
c3df4dd052
Create a tox config for automating tests for different Python versions.
...
To use:
sudo pip install tox
tox
2011-08-31 00:00:12 -07:00
Lance Stout
52ed02bd06
Update .gitignore
2011-08-12 17:22:27 -07:00
Lance Stout
9abf37bbd1
Ignore Manifest and dist dir in git.
2011-08-05 09:00:42 -07:00
Nathan Fritz
7383f72367
stanzabase indent fix
2010-03-24 17:18:39 -07:00
