Age | Commit message (Collapse) | Author |
|
into upload
Conflicts:
js/util.js
lib/attachmentlist.php
|
|
for uploads.
|
|
|
|
|
|
clip)
|
|
|
|
|
|
into upload
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app.
|
|
Conflicts:
README
|
|
|
|
|
|
into 0.8.x
|
|
|
|
|
|
|
|
|
|
notice) that's actually an attachment. Overlay (popup) on click.
|
|
|
|
thru an ajax popup.
|
|
|
|
|
|
|
|
Conflicts:
config.php.sample
|
|
|
|
Conflicts:
EVENTS.txt
|
|
|
|
|
|
|
|
links in notice sections.
|
|
|
|
|
|
|
|
|
|
sidebars relating tags and attachments.
|
|
|
|
|
|
oembed, mimetypes, etc.)
|
|
Conflicts:
config.php.sample
|
|
|
|
|
|
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
|
|
|
|
|