]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f160bb 05e3768)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Fri, 19 Mar 2010 17:08:47 +0000 (10:08 -0700)
committerZach Copley <zach@status.net>
Fri, 19 Mar 2010 17:08:47 +0000 (10:08 -0700)
commitfb50a2d83c9a530479874d51f203ad8b3d4c9a7a
tree5322601414dcb9c3b7a39516bb81bb1d7063c980tree | snapshot
parent1f160bb7bc62d8672a4e600ab73fdddffd188194commit | diff
parent05e3768e6a833d99a5180d4306d68f59e2d8f8c9commit | diff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Parse RSS items as activities
  Remove hkit and do our own hcard parsing
  Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)