[dw-free] Backing out http://hg.dwscoalition.org/dw-free/raw-rev/49b1b53b9bea; some extra stuff crep

[afuna]

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

Backing out http://hg.dwscoalition.org/dw-free/raw-rev/49b1b53b9bea; some
extra stuff crept in. Will redo.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/S2.pm
• htdocs/customize/advanced/layeredit.bml
• htdocs/js/s2edit/s2edit.js
• htdocs/js/s2edit/s2gui.js
• htdocs/js/s2edit/xlib.js
• htdocs/talkread.bml

( Diff: 7 files changed. )

[dw-free] Change console-only "set" commands to an Advanced Options tab

[afuna]

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

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

Oops. Add DW::Settings::EmailAlias file.

Patch by kareila.

Files modified:

• cgi-bin/DW/Setting/EmailAlias.pm

( Diff: 1 file changed. )

[dw-free] Fix issue with importer with invalid school names.

[mark]

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

Fix issue with importer with invalid school names.

Patch by mark.

Files modified:

• cgi-bin/DW/Worker/ContentImporter/LiveJournal.pm

( Diff: 1 file changed. )

[dw-free] OpenID with https gets extra http:// in journal profile

[afuna]

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

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

Properly display https:// websites on your profile.

Patch by afuna.

Files modified:

• cgi-bin/LJ/User.pm

( Diff: 1 file changed. )

[dw-free] Keep S2 layer editor window cursor in same place when compiling

[afuna]

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

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

Codemerge: remember position. (Also, take two on this commit.)

Patch from LiveJournal, prepared for Dreamwidth by denise.

Files modified:

• htdocs/customize/advanced/layeredit.bml
• htdocs/js/s2edit/s2edit.js
• htdocs/js/s2edit/s2gui.js
• htdocs/js/s2edit/xlib.js

( Diff: 4 files changed. )