Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
into 0.8.x
|
|
|
|
|
|
into 0.8.x
|
|
|
|
into 0.8.x
|
|
|
|
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
|
|
|
|
into upload
Conflicts:
js/util.js
lib/attachmentlist.php
|
|
PHP doesn't get the info about the charset of the connection if
you use SET NAMES. So, we use the appropriate PHP function instead.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
See: http://developers.facebook.com/news.php?blog=1&story=226
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
links in notice sections.
|
|
sidebars relating tags and attachments.
|
|
oembed, mimetypes, etc.)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
|
|
|
|
|
|
Public stream now uses IDs method
|
|
Moved the algorithm for notice stream caching to the Notice class.
|
|
|
|
|
|
The join in notice_inbox is causing temp-table sorting on identi.ca,
so I'm trying a finer-tuned approach.
|
|
|
|
correctly""
This reverts commit 86770ccde7914219a0a572ced6dd21fa65566e1d.
|