Age | Commit message (Collapse) | Author |
|
This reverts commit 06ffb8bf02b4c05f8eccd14a9ec2ddbba7ae21c5.
|
|
|
|
Conflicts:
lib/attachmentlist.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
configuration
|
|
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
|
|
|
|
|
|
attachment
|
|
api/statusnet/config.:format.
|
|
when http auth is not required.
|
|
api/statusnet/config.:format.
|
|
when http auth is not required.
|
|
the logs a little faster than ops likes. :)
|
|
|
|
|
|
|
|
|
|
We do the OStatus queue first, so if we're sending a notice to the
same server twice (e.g., with OMB), our richer and more featureful
notice comes in first.
|
|
the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
|
|
to make it easier to extract without getting extra markup.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
|