| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
|
|
|
|
into upload
|
|
Conflicts:
lib/attachmentlist.php
lib/noticelist.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into 0.8.x
|
|
markup changes.
|
|
|
|
into 0.8.x
|
|
|
|
|
|
|
|
thru an ajax popup.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
usable by first offering the option to undo and than do.
|
|
the page colors back to their original.
|
|
Rearranged swatch layout
Added background image upload input file
|
|
|
|
|
|
|
|
Using JSON to create swatches in HTML output.
|
|
links in notice sections.
|
|
|
|
|
|
sidebars relating tags and attachments.
|
|
|
|
oembed, mimetypes, etc.)
|
|
|
|
|
|
field to prioritize
|
|
|
|
|
|
|
|
|
|
|
|
Resolved Conflicts:
lib/queuehandler.php
lib/util.php
theme/base/css/display.css
|
