aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/fritzy/SleekXMPP into sleek-mergesleek-mergemathieui2015-09-2360-357/+1788
|\
| * Merge pull request #397 from rerobins/xep_0050_updatesMike Taylor2015-09-182-1/+17
| |\
| | * Merge branch 'develop' into xep_0050_updatesRobert Robinson2015-09-182-1/+17
| | |\
| | | * Update test_stream_xep_0050.pyRobert Robinson2015-09-131-0/+3
| | | * XEP0050: Add support for payload in completed responseRobert Robinson2015-09-031-0/+13
| | | * XEP_0050: Form not iterable in commandRobert Robinson2015-07-161-1/+1
| | * | Merge pull request #3 from fritzy/developRobert Robinson2015-09-1873-1213/+2408
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #396 from rerobins/add_xep_0122Mike Taylor2015-09-186-0/+315
| |\ \ \
| | * | | register_Stanza_plugin shouldn't be iterableRobert Robinson2015-09-171-1/+1
| | * | | Add 0122 to plugin/__init__.py __all__Robert Robinson2015-09-171-0/+1
| | * | | Update __init__.pyRobert Robinson2015-09-151-1/+1
| | * | | Merge branch 'add_xep_0122' of https://github.com/rerobins/SleekXMPP into add_xep_0122Robert Robinson2015-09-151-0/+1
| | |\ \ \
| | | * | | Missing xep_122 dir in setup.pyRobert Robinson2015-09-151-0/+1
| | * | | | Add test case Reported->Data Form ValidationRobert Robinson2015-09-151-4/+36
| | * | | | Merge branch 'refactor_forms' into add_xep_0122Robert Robinson2015-09-155-6/+159
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Add plugin supportRobert Robinson2015-09-141-0/+10
| | * | | | Add pluginRobert Robinson2015-09-143-99/+150
| | * | | | Working through test case issues.Robert Robinson2015-09-142-90/+89
| | * | | | Initial cut at getting the stanzas to work.Robert Robinson2015-09-143-0/+221
| * | | | | Merge pull request #393 from aalba6675/fix/timeMike Taylor2015-09-181-3/+4
| |\ \ \ \ \
| | * | | | | Only send time if Iq type is get.Richard Chan2015-08-251-3/+4
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #392 from aalba6675/fix/tel_numberMike Taylor2015-09-181-1/+2
| |\ \ \ \ \
| | * | | | | Do not overwrite telephone numbers; otherwise all TEL/NUMBER receivedRichard Chan2015-08-251-1/+2
| * | | | | | Merge pull request #389 from alexdraga/developMike Taylor2015-09-181-0/+10
| |\ \ \ \ \ \
| | * | | | | | Add get users by affiliation.Aleksandr Draga2015-08-101-0/+10
| | |/ / / / /
| * | | | | | Merge pull request #384 from elya5/patch-1Mike Taylor2015-09-181-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix UnboundlocalError in disco_browser.py exampleelya52015-07-091-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #386 from jdowner/develop-iotMike Taylor2015-09-181-1/+1
| |\ \ \ \ \ \
| | * | | | | | iot: only add the 'done' field when all devices are doneJoshua Downer2015-07-201-1/+1
| | |/ / / / /
| * | | | | | Merge pull request #395 from rerobins/refactor_formsMike Taylor2015-09-187-26/+181
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Add test case for reported and itemsRobert Robinson2015-09-155-6/+159
| | | |_|_|/ | | |/| | |
| | * | | | Fix xep_0050 changes after form refactor.Robert Robinson2015-09-142-9/+8
| | * | | | Force forms and fields to use plugin resolutionRobert Robinson2015-09-143-14/+17
| | |/ / /
| * | | | Merge pull request #394 from sangeeths/misc_updatesMike Taylor2015-08-271-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | adding 'id' to self['xep_0332'].send_request()Sangeeth Saravanaraj2015-08-271-0/+2
| |/ / /
| * | | Merge pull request #388 from sangeeths/misc_updatesMike Taylor2015-08-011-0/+4
| |\ \ \
| | * | | Retaining 'id' in the response and error stanzasSangeeth Saravanaraj2015-08-011-0/+4
| |/ / /
| * | | Merge pull request #387 from mcella/378Mike Taylor2015-07-311-12/+11
| |\ \ \ | | |/ / | |/| |
| | * | Fixes #378: must acquire JID_CACHE_LOCK before adding to JID_CACHEMichele Cella2015-07-311-12/+11
| |/ /
| * | Merge pull request #365 from jdowner/stagingMike Taylor2015-07-051-12/+2
| |\ \
| | * | Fixed importsJoshua Downer2015-05-131-12/+2
| * | | Merge pull request #366 from jdowner/develop-iot-cleanupMike Taylor2015-07-051-18/+7
| |\ \ \
| | * | | xep-0323: removed deadcodeJoshua Downer2015-05-141-10/+0
| | * | | xep-0323: spellingJoshua Downer2015-05-141-7/+7
| | * | | xep-0323: unused importJoshua Downer2015-05-141-1/+0
| | |/ /
| * | | Merge pull request #369 from stevenroose/patch-2Mike Taylor2015-07-051-1/+1
| |\ \ \
| | * | | Change to roster migration exampleSteven Roose2015-05-241-1/+1
| | |/ /
| * | | Merge pull request #370 from jdowner/develop-jidMike Taylor2015-07-051-5/+0
| |\ \ \
| | * | | Removed duplicate propertyJoshua Downer2015-05-281-5/+0
| | |/ /
| * | | Merge pull request #380 from anirudh-chhangani/XEP-0096-add-hash-paramMike Taylor2015-07-051-0/+1
| |\ \ \