summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2011-08-28Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Keep VCard photo hash cache consistent. Fix assertion on inconsistent VCard photohash cache. Conflicts: Swift/Controllers/Storages/VCardFileStorage.cpp Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
2011-08-28Fix assertion on inconsistent VCard photohash cache.Remko Tronçon
Release-Notes: Don't crash when the VCard cache is inconsistent.
2011-08-28Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Remove relaxation of not checking JIDs if the IQRouter's JID isn't set. Fixed Request::isAccountJID(). Check sender on incoming IQ responses.
2011-08-28Check sender on incoming IQ responses.Remko Tronçon
Release-Notes: Fixed a bug whereby the sender of an iq wasn't being checked before matching it to a request.
2011-05-25Change include order so clang doesn't complain anymore.Tobias Markmann
License: This patch is BSD-licensed, see http://www.opensource.org/licenses/bsd-license.php
2011-05-05Replace ByteArray by typedef.Remko Tronçon
2011-05-02Replace auto_ptr by shared_ptr.Remko Tronçon
2011-04-30Replace #icnlude "" by #include <> in Swiften.Remko Tronçon
2011-02-14Removed Swift::String.Remko Tronçon
2010-10-26Fix compliation problems with CLang.Remko Tronçon
2010-09-11Added VCardAvatarManager for offline avatars.Remko Tronçon
Resolves: #418
2010-03-28Removing submodules.Remko Tronçon
2010-03-28Moved Swiften to a separate module.Remko Tronçon