summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-07Get past the configure stage for iOS-based xcode targetsKevin Smith
Without telling the linker that it's for iOS, you get link errors during configure, like: ld: building for MacOSX, but linking against dylib built for iOS Simulator file '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk/System/Library/Frameworks/Foundation.framework/Foundation' for architecture i386 Change-Id: I446bc99d5b8a2ba95a441e9ac0b82d6b64ff3d83
2013-11-03Split experimental File Transfer out from History and Whiteboarding.Kevin Smith
Effectively disables whiteboarding and history in default builds so we can avoid having to do a full cleanup of them for 3.0. File transfer remains enabled in default builds as we're intending getting that ready and shipping it. Change-Id: I8c1dcc989f238b58d6d7c426485e7cf582514d8f
2013-10-31Merge branch 'swift-2.x'Remko Tronçon
* swift-2.x: Update Hebrew translation Don't install the overrides for other packages in swift-im Update Debian building for latest lintian rules Don't allow passing NULL to the JID ctor Conflicts: Swift/Packaging/Debian/debian/control.in Change-Id: Iadbd434627e190d7369aa61f67ab211e4fbcf02a
2013-10-30Implement missing PubSub owner queries.Remko Tronçon
Implemented get_owner_subscriptions, get_owner_affiliations, and set_owner_affiliations. Change-Id: Ib3ccf2f7e7fe228ccdddf83bde324341e69362d6
2013-10-30Implement missing conversion of some PubSub attributesRemko Tronçon
Change-Id: I51a4249fa84aa40dc2a6e3f2c7e5a9c8fce93f32
2013-10-29Swiften: Fix PubSub.lua test retrieving subscriptionsRemko Tronçon
Change-Id: Ie7a6063c0070c3983119823da19a20d0a64e2ed8
2013-10-29Sluift: Fix bug in PubSubNode.list_itemsRemko Tronçon
Change-Id: I5c500bdda0f76e81b0b7ae6ce00ee57c2c0fb3e8
2013-10-29Fix unit test on MavericksRemko Tronçon
Change-Id: I11101d660bb0debe85069eb3f2ed30987fa0d5ec
2013-10-28Add port option to Sluift client connectRoger
Provide a mechanism to allow setting both the port and hostname for a Sluift client connection. By default Sluift leave port to -1 to use the port discovered by SRV lookups, with 5222 as a fallback. With this change, the port is now manually configurable as well. Change-Id: Idef5457e95127cfa86181b462d9ef42aa4f096ff
2013-10-28Update Hebrew translationRemko Tronçon
Change-Id: Id9733b2fc802b249b9a2949b0a8cc5af9613db44
2013-10-26Fix shortcut handling in QtTabbable.Tobias Markmann
Tested under Gnome 2.32, OS X 10.8 and Win 8.1. Change-Id: If7d41c2254e53ad0d9b745e27dc1db77d64cec50 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Add small margin to QtRemovableItemDelegate.Tobias Markmann
Change-Id: I8032c537c3e5914f43dffb4818bb00caf2ab3bbd License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Move 'Add Field' button inside the scroll view.Tobias Markmann
Change-Id: I1259e6de80a5c8781ba71dad1a52228f37a7ce7e License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Set a adequate initial size for VCard window.Tobias Markmann
Change-Id: If2723134132d2e766149b89170e9d3452a28c535 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Remove name fields from field menu. They're always displayed in edit ↵Tobias Markmann
mode now. Change-Id: I9ee5faae53e9300300e01a1782b51645399f1669 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Fix address label name.Tobias Markmann
Change-Id: Ib11115a37b5c4fc61dbe74e146a42e9e77ad59ea License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Guarantee an empty row when editing organisation units, so the user ↵Tobias Markmann
can add new units. Change-Id: Ibdc132467e69ff906c4b4bea2d12f8b5704cf74c License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-26VCard: Removing whitespace due to empty fields in the full name.Tobias Markmann
Change-Id: Ib97d7bff7fcd0364924e6266c4d20d7d71e9ad09 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-17VCard: Assert existence of field widgets instead of if-testing.Tobias Markmann
Change-Id: Ie92f4f1714b8fb6dc5c1e2729151c8e00c33215b License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-15Add qt5 to docsKevin Smith
Change-Id: If454a17361c8dcba747278a98edeeeb56e21d54d
2013-10-15Don't install the overrides for other packages in swift-imKevin Smith
Change-Id: I2847529219842597234a5a74b448c9426b6db05a
2013-10-13Apply MiniUPNP and NatPMP Android patchesRemko Tronçon
Change-Id: Iaa8c564f21d1f7354f597ceca478e52fae6c774e
2013-10-13Update Debian building for latest lintian rulesKevin Smith
Change-Id: I394f3a1fbd1971421979700ea70d882d0730c679
2013-10-12Clip rendering of text in DelegateCommons.Tobias Markmann
Ensure that text rendering bugs on some unicode characters (e.g. U+0E47, U+0E49) don't spill outside the indented drawing region. Change-Id: Ia6683c943d90adb572b6072b037a4e0886ac068c License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-09VCard UI fixes.Tobias Markmann
Fix QtRemovableItemDelegate and QtCloseButton rendering on Windows. Fix organization's unit field to allow creation of new units. Fix QtResizableLineEdit's sizeHint to be relative to font metrics. Change-Id: I69809c9504fd4c9e00db3b3782f33dcdd941d0cd License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-04Fix heap-use-after-free bugs reported by asan.Tobias Markmann
One only showed in netbook-mode. Another got introduced by the impromptu patch. Change-Id: Id878d001b6bac67f943a86386300c8a0db3bc74e License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-10-03Now use semicolons for the listing of a pair of tabs with messages in chats.Kevin Smith
This is to support using commas for listing multiple participants in a single chat. Change-Id: Ic41f4e4db707411847405e96c4fae32973b6ac69
2013-10-03Reformat the includes for QtChatWindow.hKevin Smith
Change-Id: I80a8de3d70fae1e62a2991c4efc72a9a563194dd
2013-10-03Reformat the includes for QtChatWindowKevin Smith
Change-Id: Ibb9832c1aeae5af08ff0351b5ef5b9335a612539
2013-10-03Factor the webkit chat view out of QtChatWindow.Kevin Smith
This will let us substitute it for an alternative chat view. Change-Id: I002d9b90a7f618a354dda648c280ccee0e48edd7
2013-10-01Fix bug on writing empty bytearray in file bytestream.Remko Tronçon
Change-Id: I55e79045d55c206d705609266262d734c4ed2853
2013-10-01Adding support for impromptu MUCs.Tobias Markmann
Change-Id: I363e9d740bbec311454827645f4ea6df8bb60bed License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-09-30Provide map serialization.Kevin Smith
Needed for Tobias's upcoming patch Change-Id: Ie3a86f17338c053c80f7d02e696b9fe92741beba
2013-09-23Don't crash if server doesn't send cert in TLS handshakeNick Hudson
This patch reflects a change to Stroke, which is described as follows: If a TLS connection results in the server choosing an anonymous cipher suite, then no server certificate will be returned by the server. This ought not to happen, since XMPP clients are expected only to propose non-anonymous cipher suites, but it could be that a client is coded to propose anonymous suites, or that a bug in the server means that it fails to return a server certificate. This change updates the ServerIdentityVerifier to make it resilient against these situations, treating this situation as equivalent to "certificate presented by server does not verify". Test-information: Tested in Stroke. Untested in Swiften Change-Id: Iec815b09b6be675edad1d479d1a0a9d6b0b91bf3
2013-09-21Sluift: Fix bug in DiscoItems element convertorRemko Tronçon
Change-Id: I02f038865850b8d86ee85115ef9a63cc2ce0db8e
2013-09-21Sluift: Update documentationRemko Tronçon
Change-Id: I4b3450d166048db52ca4f531277799bb16996385
2013-09-21Sluift: Add support for ad-hoc commandsRemko Tronçon
Change-Id: I4ac2d0b07841b03086d9dbd9fa06d1f030f4e1ca
2013-09-20Sluift: Add convenient way for filling in formsRemko Tronçon
Change-Id: Ia265e8659e32f9e7a221d986625c830953a93ddc
2013-09-17Don't use implicit bool conversion on shared_ptrRemko Tronçon
C++11 doesn't have implicit conversion to bool on shared_ptr. The cleanest fix is to compare against nullptr, but this only works on C++11. Change-Id: Ia2b4b5d90f99aa24c4f3bdf0d680343754e32ec2
2013-09-16Disable Boost Signals warningsRemko Tronçon
Change-Id: I6bb4c81b1f92a5b038ff034a4e03bab997fe8880
2013-09-16Add Sluift READMERemko Tronçon
Contains only some build hints at the moment. Change-Id: I09fc3b133e880949ad8ee33227ab35f36f3ec875
2013-09-16Enable WebKit's Inspector if Swift is run in debug mode.Tobias Markmann
Change-Id: I758eb9e7df06887e9946d2a1fa56efed41796bb6 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-09-16Fix heap-use-after-free bug reported by asan.Tobias Markmann
Change-Id: I891333b992d08b83cd4127bfd0893399735b5432 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-09-16Disable dynamic loading in bundled LuaRemko Tronçon
Change-Id: Ic1c4b9020db28c8646139ee75bf65fb8ac2886e3
2013-09-15Install SluiftRemko Tronçon
Change-Id: Ia08269b51528b4458418939e5478cb320f4ba40d
2013-09-15Use system Lua if presentRemko Tronçon
Change-Id: I665a603b1afa1e24e1b73618e976113a87be2001
2013-09-14Fix install name of libSwiften.dylib on OS XRemko Tronçon
Change-Id: I4449c663154de62a26b532754968cae4f0f4642c
2013-09-08Add missing make_shared include.Remko Tronçon
Change-Id: If81b3735a9924a4281694e985acadf859a8e9998
2013-09-08scons2ninja: Support quoted flags.Remko Tronçon
Change-Id: Iea4206b281400995734263fc39062196d2d0446f
2013-09-08Use (deprecated) declaration of ivars in interfaceRemko Tronçon
This is necessary for supporting 'legacy' Objective-C runtimes (e.g. OS X 32-bit). Partly reverts 88153286ea2f11fea24b950e7dbb0075ceb49a54. Change-Id: Ibc6e1dad255ae8e36b946ef4c792c0f272c73d71