Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
actions/twitapiusers.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit e21d2cfdb5f259a07d7af0e3c7f5421315ed2710.
|
|
|
|
|
|
into 0.8.x
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* friendships_show:
Implement friendships/show API method
Route and stub for new friendships/show API method
|
|
* '0.8.x' of git@gitorious.org:laconica/dev:
null for both args in conversation
no limit on conversation stream
fixed limit for conversations
only show subscribe button in profile list for local users
move peoplesearchresults class to action/peoplesearch
only show subscription controls to owner
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* '0.8.x' of git@gitorious.org:laconica/dev:
Disabled textarea focus for conversation page since most entrances to
|
|
|
|
this page is with 'in context' link (which includes a fragment
identifier)
|