]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/User_im_prefs.php
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01a03e3 e4d9348)
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 2 Apr 2010 22:56:25 +0000 (15:56 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 2 Apr 2010 22:56:25 +0000 (15:56 -0700)
commit2f4438fe24a99e5493469f734bf41547c8ad2ce5
tree71bd93323bb6d39696ea6d13d961d4395be59ee4tree | snapshot
parent01a03e34c8d286011c0f4301e60c103d992a449acommit | diff
parente4d934827bd7b2162e870611662549a5df759b57commit | diff
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.
classes/User.php diff1 | diff2 | blob | history
lib/default.php diff1 | diff2 | blob | history
lib/util.php diff1 | diff2 | blob | history
plugins/Xmpp/XmppPlugin.php diff1 | | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)