GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
18,177 Commits 8 Branches 4 Tags 310 MiB
b38e71e544
Commit Graph

108 Commits

Author SHA1 Message Date
Craig Andrews
6a848bcc8a send_message -> sendMessage 2010-09-03 17:50:28 -04:00
Brion Vibber
173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
 2010-05-05 17:11:23 -07:00
Brion Vibber
ddc7811a7b Move XMPPHP from core extlibs to Xmpp plugin extlibs 2010-05-05 16:52:31 -07:00
Brion Vibber
5414396a2e IM cleanup on 1.0.x branch: 
* 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-30 15:29:05 -07:00
Brion Vibber
2f4438fe24 Merge branch '0.9.x' into 1.0.x 
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-04-02 15:56:25 -07:00
Craig Andrews
714d920fae Merge branch '0.9.x' into 1.0.x 
Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php
 2010-03-08 17:22:23 -05:00
Craig Andrews
c187bf5597 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php
 2010-02-24 20:52:45 -05:00
Craig Andrews
e9995b0f6a Create IM plugin, Pluginize XMPP, Create AIM plugin 2010-01-27 13:48:35 -05:00