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
..
2010-02-11 16:51:15 -05:00
2010-01-06 14:28:40 -08:00
2008-12-23 14:33:23 -05:00
2010-02-05 03:18:43 +00:00
2010-03-23 09:56:05 -07:00
2009-09-15 21:12:44 -04:00
2010-02-11 17:03:31 -05:00
2010-03-23 11:08:30 -07:00
2010-03-10 15:13:16 -08:00
2010-03-10 15:13:16 -08:00
2009-08-26 10:41:36 -04:00
2010-01-06 14:28:40 -08:00
2010-03-26 18:16:44 -04:00
2010-03-05 03:55:56 +00:00
2008-12-23 14:33:23 -05:00
2008-12-23 14:33:23 -05:00
2010-03-18 09:24:55 -07:00
2010-03-06 00:30:15 +00:00
2010-01-06 14:28:40 -08:00
2010-01-06 14:28:40 -08:00
2010-01-13 02:16:13 -08:00
2010-04-02 15:43:30 -07:00
2008-12-23 14:33:23 -05:00
2010-02-25 08:44:15 -05:00
2009-10-21 22:43:41 -04:00
2010-01-09 15:26:06 -08:00
2010-03-29 15:15:51 -07:00
2009-12-15 10:31:25 -05:00
2010-02-12 11:15:12 -08:00
2010-03-02 11:54:02 -08:00
2008-12-23 14:33:23 -05:00
2010-03-02 11:54:02 -08:00
2010-03-23 17:24:01 -07:00
2010-01-24 16:36:05 -08:00
2010-02-05 03:18:43 +00:00
2009-08-26 10:41:36 -04:00
2010-03-15 16:08:00 -07:00
2009-02-28 15:17:49 -08:00
2010-04-01 10:15:40 -07:00
2010-01-22 12:52:36 -08:00
2009-05-22 21:11:46 -04:00
2008-12-23 14:33:23 -05:00
2009-11-25 22:23:21 +00:00
2010-03-02 11:54:02 -08:00
2010-03-19 12:38:14 -07:00
2010-01-28 13:53:28 -05:00
2008-12-23 14:33:23 -05:00
2010-01-28 20:09:17 -08:00
2010-02-16 09:16:51 -08:00
2010-03-08 17:22:23 -05:00
2010-02-12 11:15:12 -08:00
2010-03-22 14:22:18 -04:00
2010-01-24 16:36:05 -08:00
2010-03-12 09:41:49 -08:00
2010-01-27 13:48:35 -05:00
2009-12-30 08:56:43 -10:00
2010-03-08 13:15:49 -05:00
2010-04-02 15:56:25 -07:00