summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2012-05-12Show Certificate dialog from certificate error window.Remko Tronçon
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-28Merge remote branch 'origin/swift-1.x'Remko Tronçon
* swift-1.x: Catch boost file system errors when reading VCards. Conflicts: Swift/Controllers/Storages/VCardFileStorage.cpp
2011-05-05Replace ByteArray by typedef.Remko Tronçon
2011-04-26Added CertificateMemoryStorage.Remko Tronçon
2011-04-25Fixed compilation.Remko Tronçon
2011-04-25Moved file storages to Swift.Remko Tronçon