| Age | Commit message (Collapse) | Author |
|---|
|
|
|
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.
|
|
|
|
client-side redirect to the target URL, which will at least be useful.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onclick, it doesn't follow through on the href (e.g., it would play
the video in the overlay instead)
|
|
|
|
|
|
into 0.8.x
|
|
|
|
Conflicts:
actions/designsettings.php
|
|
|
|
|
|
xhtml tag.
|
|
into upload
Conflicts:
js/util.js
lib/attachmentlist.php
|
|
clip)
|
|
Conflicts:
lib/attachmentlist.php
lib/noticelist.php
|
|
|
|
|
|
|
|
|
|
thru an ajax popup.
|
|
|
|
sidebars relating tags and attachments.
|
