Age | Commit message (Collapse) | Author |
|
Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
|
|
|
|
* 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
|
|
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.
|
|
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
|
|
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
|
|
|