[dw-free] Many tests in t/ fail

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/ea715afa6e7e]

http://bugs.dwscoalition.org/show_bug.cgi?id=1721

Skip tests for directory; running without workers is known to not work right
now.

Patch by afuna.

Files modified:

• t/directorysearch-extra.t
• t/directorysearch.t

( Diff: 2 files changed. )

[dw-free] Layout: Tranquility

[afuna]

[commit: http://hg.dwscoalition.org/dw-free/rev/ee6d7200c554]

http://bugs.dwscoalition.org/show_bug.cgi?id=1735

New layout, based on Tranquility II from LiveJournal. Three themes: Night
Sea, Lilac, Brick.

(Also, we finally have enough layouts that it no longer all fits into one
page of the featured! Beginning to remove featured layouts, starting from
the ones that have been on the page longest. The base layouts to-be-category
will let people still discover them easily.)

Patch by afuna.

Files modified:

• bin/upgrading/s2layers.dat
• bin/upgrading/s2layers/tranquilityiii/layout.s2
• bin/upgrading/s2layers/tranquilityiii/themes.s2
• cgi-bin/LJ/S2Theme.pm
• cgi-bin/LJ/S2Theme/tranquilityiii.pm
• cgi-bin/LJ/S2Theme/zesty.pm
• htdocs/img/customize/previews/tranquilityiii/brick.png
• htdocs/img/customize/previews/tranquilityiii/lilac.png
• htdocs/img/customize/previews/tranquilityiii/nightsea.png

( Diff: 9 files changed. )

[dw-free] Get rid of occasional spurious extra space after username in RTE

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/af4a985f0c05]

http://bugs.dwscoalition.org/show_bug.cgi?id=1742

Rewrite RTE logic to avoid extra space.

Codemerge from LJ; patch prepared by gchick.

Files modified:

• htdocs/stc/fck/editor/plugins/livejournal/fckplugin.js

( Diff: 1 file changed. )

[dw-free] Navbar displaying wrong relationship level

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/257410deeeaa]

http://bugs.dwscoalition.org/show_bug.cgi?id=1770

Correct navbar text for mutual subscriptions or mutual access.

Patch by yvi.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/weblib.pl

( Diff: 2 files changed. )

[dw-free] make_system.pl has a hardcoded "LiveJournal"

[kareila]

[commit: http://hg.dwscoalition.org/dw-free/rev/de69dffa3c00]

http://bugs.dwscoalition.org/show_bug.cgi?id=1719

Use $LJ::SITENAMESHORT.

Patch by afuna.

Files modified:

• bin/upgrading/make_system.pl

( Diff: 1 file changed. )