| Thu, 18 Feb 2010 22:28:41 +0000 |
Marcus Lundblad |
Make it compile again after merge
|
| Thu, 18 Feb 2010 21:59:26 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 267f28808ab6eeda6b5d68f6433f2b3fcf230d4f)
|
| Sun, 29 Nov 2009 19:06:30 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head fd01d69465dca1c23c811963e2545236c2749d55)
|
| Mon, 26 Oct 2009 22:16:32 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head cd4ab1e30725817663f30bcb4d6cbe22879b271f)
|
| Tue, 20 Oct 2009 22:32:09 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 0d33eae1cfd57cb5f459518ad5db14230f13792b)
|
| Sun, 20 Sep 2009 19:57:07 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368)
|
| Tue, 01 Sep 2009 19:50:20 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 6d3fc30a0a0a379281efc5a6872a9c1d7c24c650)
|
| Mon, 24 Aug 2009 19:21:21 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f)
|
| Tue, 28 Jul 2009 20:51:56 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 46ae10a850bb3c3ce9a3bb47a7de9edd4becdb93)
|
| Sun, 12 Jul 2009 20:47:45 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b)
|
| Mon, 29 Jun 2009 20:44:45 +0000 |
Marcus Lundblad |
Added an "ephemeral" argument when creating local data objects (given a CID).
|
| Wed, 24 Mar 2010 17:44:40 +0900 |
Yoshiki Yazawa |
merged with im.pidgin.pidgin
|
| Tue, 23 Mar 2010 22:17:34 +0000 |
Marcus Lundblad |
jabber: Cache incoming BoB object per JID (and local JID) instead of discarding
|
| Mon, 22 Mar 2010 21:34:17 +0000 |
Marcus Lundblad |
jabber: Validate the hash on incoming BoB objects (in case the CID is on the
|
| Sun, 21 Mar 2010 19:39:40 +0000 |
Marcus Lundblad |
jabber: Refactor BoB request code to reside inside data.c
|
| Tue, 16 Mar 2010 12:07:06 +0900 |
Yoshiki Yazawa |
merged with im.pidgin.pidgin
|
| Mon, 08 Mar 2010 16:54:02 +0000 |
Paul Aurich |
jabber: Unlock from locked resource on a message *with content*, as opposed to any message.
|
| Mon, 16 Nov 2009 20:45:56 +0000 |
Marcus Lundblad |
Let _got_attention call _conversation_attention, instead of having prpls do it
|
| Mon, 16 Nov 2009 19:59:20 +0000 |
Marcus Lundblad |
jabber: Don't pre-create a conversation on an incoming attention
|
| Thu, 12 Nov 2009 23:25:57 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 8b6b0e8385b470c8181ddd6b6fd6d8e708c08f9e)
|
| Tue, 03 Nov 2009 18:27:22 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 8c322571bfb4f2d00c9126e59746445f877be296)
|
| Tue, 20 Oct 2009 22:32:26 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 0d33eae1cfd57cb5f459518ad5db14230f13792b)
|
| Sun, 20 Sep 2009 19:57:21 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368)
|
| Tue, 01 Sep 2009 19:51:07 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 6d3fc30a0a0a379281efc5a6872a9c1d7c24c650)
|
| Mon, 24 Aug 2009 19:23:56 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f)
|
| Tue, 28 Jul 2009 20:52:33 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 46ae10a850bb3c3ce9a3bb47a7de9edd4becdb93)
|
| Sun, 12 Jul 2009 20:48:50 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b)
|
| Mon, 22 Jun 2009 21:53:53 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 74c00c33cab0e208691543b25eeae7906f6e4181)
|
| Mon, 08 Jun 2009 18:28:31 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 46523386d682c917679b3de662d51a5bda0da46b)
|
| Mon, 25 May 2009 19:27:33 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head ca6eb11f6084be37aeabcb2d99df789aaf8b4afd)
|
| Wed, 13 May 2009 20:38:38 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 191873f724e4551edc337f1e018980f32c41391b)
|
| Thu, 07 May 2009 21:38:08 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head df25bed2c1c0d097b7f52fbfae76223d8552f0c3)
|
| Sat, 02 May 2009 06:39:51 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 13ac492a493b4d31c8b29905174b43a533304300)
|
| Sun, 26 Apr 2009 20:01:17 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 371b6104658ad98c418ac711643192c2e34428ea)
|
| Wed, 22 Apr 2009 07:56:16 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 6a70c2c1325aeb644bff8476f94c5a25f83044fb)
|
| Tue, 07 Apr 2009 08:12:56 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2)
|
| Mon, 02 Mar 2009 23:44:05 +0000 |
Marcus Lundblad |
Removed some extra whitespaces
|
| Mon, 02 Mar 2009 23:34:48 +0000 |
Marcus Lundblad |
Make it work again after the merge from i.p.p.... :)
|
| Mon, 02 Mar 2009 22:07:59 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 431618de0f30a6938f7e14d2d61ee5d7738acd59)
|
| Tue, 13 Jan 2009 18:39:52 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
|
| Thu, 01 Jan 2009 21:19:11 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head dd9cb9ed28311438c0cc3c2962f1c030fb282df3)
|
| Thu, 01 Jan 2009 21:16:19 +0000 |
Marcus Lundblad |
Manual merge
|
| Thu, 01 Jan 2009 21:01:42 +0000 |
Marcus Lundblad |
Use purple_prpl_got_attention
|
| Sun, 07 Dec 2008 01:37:06 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 1203a733696f95eef53b04b5078e0a779371b4d3)
|
| Mon, 24 Nov 2008 22:13:44 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head 7399f80ea98924dbddd57be1e652ecbae89d3a8e)
|
| Sun, 16 Nov 2008 15:40:12 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.pidgin' (head f3891f3348abfe90fbe60a054833c12075aa8df4)
|
| Mon, 20 Oct 2008 18:44:44 +0000 |
Marcus Lundblad |
propagate from branch 'im.pidgin.cpw.malu.xmpp.attention' (head f27e3d2026fab3f93eacb55e0d4fc8d6c3f75f31)
|
| Mon, 20 Oct 2008 18:44:06 +0000 |
Marcus Lundblad |
Adds attention UI to Pidgin (can send attentions using a menu item)
|
| Mon, 15 Feb 2010 18:44:44 +0900 |
Yoshiki Yazawa |
merged with im.pidgin.pidgin
|
| Sun, 14 Feb 2010 08:06:00 +0000 |
Paul Aurich |
jabber: Simplify.
|
| Wed, 10 Feb 2010 06:43:51 +0000 |
Paul Aurich |
Oops, that wasn't meant to be left in as a warning, but noting these is probably good.
|
| Wed, 10 Feb 2010 05:56:53 +0000 |
Paul Aurich |
jabber: Cleanup (and drop that unnormalized find function)!
|
| Wed, 10 Feb 2010 05:06:36 +0000 |
Paul Aurich |
jabber: Document jabber_find_unnormalized_im_conv (and my guess as to why
|
| Wed, 10 Feb 2010 04:35:10 +0000 |
Paul Aurich |
jabber: Use some convenience variables here.
|
| Wed, 10 Feb 2010 04:32:51 +0000 |
Paul Aurich |
Document the resource<>conversation binding (and how it works).
|
| Sat, 06 Feb 2010 15:45:51 +0900 |
Yoshiki Yazawa |
merged with im.pidgin.pidgin
|
| Wed, 03 Feb 2010 21:40:39 +0000 |
Paul Aurich |
jabber: Log a warning (with the shortcut) when refusing to send a smiley.
|
| Wed, 03 Feb 2010 21:34:41 +0000 |
Marcus Lundblad |
jabber: Don't print the smiley shortcut in the error message when trying to
|
| Wed, 03 Feb 2010 21:11:25 +0000 |
Marcus Lundblad |
jabber: Don't send custom smileys larger than the recommended maximum BoB size
|
| Tue, 26 Jan 2010 17:42:57 +0900 |
Yoshiki Yazawa |
merged with im.pidgin.pidgin
|
