summaryrefslogtreecommitdiff
path: root/plugins/Xmpp
AgeCommit message (Collapse)Author
2010-05-05Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05Move XMPPHP from core extlibs to Xmpp plugin extlibsBrion Vibber
2010-04-30IM cleanup on 1.0.x branch:Brion Vibber
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups
2010-04-02Merge branch '0.9.x' into 1.0.xBrion Vibber
Conflicts: actions/imsettings.php lib/jabber.php Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet. Should also move over the test cases.
2010-03-08Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: classes/statusnet.ini db/statusnet.sql lib/jabber.php lib/xmppmanager.php
2010-02-24Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php
2010-01-27Create IM plugin, Pluginize XMPP, Create AIM pluginCraig Andrews
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 08:18:24 +0000