changelog | [dreamwidth/dw-free] 55de8f: [#972] updated rename-related code to use DW::Form...

Branch: refs/heads/code-tour
Home: https://github.com/dreamwidth/dw-free
Commit: 55de8f41e2a499ea7d2b176dfc5da5ac6d3b9b79
https://github.com/dreamwidth/dw-free/commit/55de8f41e2a499ea7d2b176dfc5da5ac6d3b9b79
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M cgi-bin/DW/User/Rename.pm
M htdocs/stc/rename.css
M views/admin/rename_edit.tt
M views/admin/rename_new.tt
M views/rename.tt
M views/rename/swap.tt

Log Message:
-----------
[#972] updated rename-related code to use DW::FormErrors

This is mostly a line-by-line search-and-replace, but return values
were changed in a few places where it made sense to do so.

Commit: 68de4a1812c884d9df722677ac352290abd8d13a
https://github.com/dreamwidth/dw-free/commit/68de4a1812c884d9df722677ac352290abd8d13a
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M htdocs/stc/rename.css
M views/rename.tt

Log Message:
-----------
[#972] update rename.css: remove unneeded code, add needed styling

Removed two style lines that appeared to duplicate the default
Foundation styling, and moved another line that only affected
one page into the style header tag for that page.

Also added styling for p.note, used in rename.tt and admin/rename_edit.tt,
which displays text slightly smaller and in an italic font.

Commit: 302f9a9f958c59978c8cbbc97687fe02101c968c
https://github.com/dreamwidth/dw-free/commit/302f9a9f958c59978c8cbbc97687fe02101c968c
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
A htdocs/scss/pages/rename.scss
R htdocs/stc/rename.css
M views/admin/rename_edit.tt
M views/admin/rename_new.tt
M views/rename.tt
M views/rename/swap.tt

Log Message:
-----------
[#972] convert rename-related pages to Foundation

This covers the 4 pages that were affected by the error-handling
changes, 3 of which used rename.css for styling. The remaining
style rules covered font sizing and padding, and were retained
in pages/rename.scss.

Fixes #972.

Commit: 9c8b793a8e84c4ef503325ed65fcf7cb1cce2c45
https://github.com/dreamwidth/dw-free/commit/9c8b793a8e84c4ef503325ed65fcf7cb1cce2c45
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M views/admin/rename.tt

Log Message:
-----------
[#972] convert admin/rename.tt to Foundation

This adds Foundation styling to admin/rename.tt, which used
neither error-handling nor custom styling, but was the only
other rename-related page template.

Includes additional in-page styling for the input field, so that it
doesn't take up the entire width of the page, and adds paragraph
tags around the link to /rename/new.

Commit: 7a3860b1bb83e8db0a2f6b74c59e4a29da29a5df
https://github.com/dreamwidth/dw-free/commit/7a3860b1bb83e8db0a2f6b74c59e4a29da29a5df
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M views/rename.tt

Log Message:
-----------
[#1504] close label tags to avoid text focus issues in Safari

Two label tags were unclosed, leading to JS focus problems in Safari.

Closing the labels caused them to add line breaks. Added in-page
"display: inline" styling to keep the line unbroken.

Fixes #1504.

Commit: 06a5d08d4783e383d60ff3f415f2da56716db9ba
https://github.com/dreamwidth/dw-free/commit/06a5d08d4783e383d60ff3f415f2da56716db9ba
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M views/admin/rename_new.tt

Log Message:
-----------
redisplay submitted data when presenting an error on rename_new.tt

If there is an error submitting the form, make sure the submitted
usernames are retained when redisplaying the form, as is commonly
expected practice.

Commit: 1169e31de0af921e9f0760d33093df65779ac325
https://github.com/dreamwidth/dw-free/commit/1169e31de0af921e9f0760d33093df65779ac325
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M cgi-bin/DW/RenameToken.pm

Log Message:
-----------
Fix logged warnings from testing

1. Avoid undefined user object warning in DW/Controller/Rename.pm by
not executing a user method on an undefined user.

2. Remove uninitialized value warning in DW::RenameToken by not
using the 'uc' operator on an undefined string.

Commit: e48c520212ba09f9f6738976363042159e0fdcdd
https://github.com/dreamwidth/dw-free/commit/e48c520212ba09f9f6738976363042159e0fdcdd
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M cgi-bin/DW/RenameToken.pm
M htdocs/scss/pages/rename.scss

Log Message:
-----------
[#1505] style tweaks from code review

Commit: a4845ef6f91ac371731832c5b8fa5ce2d0d76b6b
https://github.com/dreamwidth/dw-free/commit/a4845ef6f91ac371731832c5b8fa5ce2d0d76b6b
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-01 (Sat, 01 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M cgi-bin/DW/RenameToken.pm
M cgi-bin/DW/User/Rename.pm
A htdocs/scss/pages/rename.scss
R htdocs/stc/rename.css
M views/admin/rename.tt
M views/admin/rename_edit.tt
M views/admin/rename_new.tt
M views/rename.tt
M views/rename/swap.tt

Log Message:
-----------
Merge pull request #1505 from kareila/972-rename-foundation

Convert rename-related pages to Foundation

Commit: a8f34906fccad3355b93ff1686814ad7ead44b04
https://github.com/dreamwidth/dw-free/commit/a8f34906fccad3355b93ff1686814ad7ead44b04
Author: hotlevel4 <hotlevel4@hotmail.com>
Date: 2015-08-04 (Tue, 04 Aug 2015)

Changed paths:
A cgi-bin/DW/Controller/Support/History.pm
R htdocs/support/history.bml
A views/support/history.tt
A views/support/history.tt.text

Log Message:
-----------
(Issue 1046) Convert Support History to TT + Foundation

English-strips the page and converts it to TT and Foundation.

Commit: d32c8d62e250e7d0d9d552335f66516a9e7aee4b
https://github.com/dreamwidth/dw-free/commit/d32c8d62e250e7d0d9d552335f66516a9e7aee4b
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-04 (Tue, 04 Aug 2015)

Changed paths:
A cgi-bin/DW/Controller/Support/History.pm
R htdocs/support/history.bml
A views/support/history.tt
A views/support/history.tt.text

Log Message:
-----------
Merge pull request #1503 from hotlevel4/bug1046/convertSupportHistorytoTT

(Issue #1046) Convert Support History to TT + Foundation

Commit: 61a6d05d73df9a3270fda549d4ecf17a8105cf1d
https://github.com/dreamwidth/dw-free/commit/61a6d05d73df9a3270fda549d4ecf17a8105cf1d
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-04 (Tue, 04 Aug 2015)

Changed paths:
M htdocs/js/pages/entry/new.js

Log Message:
-----------
[#1502] in setTimeToNow(), don't multiply minutes by 100

The lion's share of the credit for this fix goes to AlexSeanchai
for pattern recognition and exor674 for diagnosing.

Fixes #1502.

Commit: 4e5e95ff17d0139d644be80d9d0bfa08eecd67c1
https://github.com/dreamwidth/dw-free/commit/4e5e95ff17d0139d644be80d9d0bfa08eecd67c1
Author: Mark Smith <mark@qq.is>
Date: 2015-08-04 (Tue, 04 Aug 2015)

Changed paths:
M htdocs/js/pages/entry/new.js

Log Message:
-----------
Merge pull request #1511 from kareila/1502-js-time

[#1502] in setTimeToNow(), don't multiply minutes by 100

Commit: 6e16848c9a2031706a7270a50bc66df8c43cae76
https://github.com/dreamwidth/dw-free/commit/6e16848c9a2031706a7270a50bc66df8c43cae76
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-05 (Wed, 05 Aug 2015)

Changed paths:
M bin/upgrading/moods.dat
A htdocs/img/mood/big-eyes/accomplished.png
A htdocs/img/mood/big-eyes/aggravated.png
A htdocs/img/mood/big-eyes/amused.png
A htdocs/img/mood/big-eyes/angry.png
A htdocs/img/mood/big-eyes/annoyed.png
A htdocs/img/mood/big-eyes/anxious.png
A htdocs/img/mood/big-eyes/apathetic.png
A htdocs/img/mood/big-eyes/artistic.png
A htdocs/img/mood/big-eyes/awake.png
A htdocs/img/mood/big-eyes/bitchy.png
A htdocs/img/mood/big-eyes/blah.png
A htdocs/img/mood/big-eyes/blank.png
A htdocs/img/mood/big-eyes/bored.png
A htdocs/img/mood/big-eyes/bouncy.png
A htdocs/img/mood/big-eyes/busy.png
A htdocs/img/mood/big-eyes/calm.png
A htdocs/img/mood/big-eyes/cheerful.png
A htdocs/img/mood/big-eyes/chipper.png
A htdocs/img/mood/big-eyes/cold.png
A htdocs/img/mood/big-eyes/complacent.png
A htdocs/img/mood/big-eyes/confused.png
A htdocs/img/mood/big-eyes/contemplative.png
A htdocs/img/mood/big-eyes/content.png
A htdocs/img/mood/big-eyes/cranky.png
A htdocs/img/mood/big-eyes/crappy.png
A htdocs/img/mood/big-eyes/crazy.png
A htdocs/img/mood/big-eyes/creative.png
A htdocs/img/mood/big-eyes/crushed.png
A htdocs/img/mood/big-eyes/curious.png
A htdocs/img/mood/big-eyes/cynical.png
A htdocs/img/mood/big-eyes/depressed.png
A htdocs/img/mood/big-eyes/determined.png
A htdocs/img/mood/big-eyes/devious.png
A htdocs/img/mood/big-eyes/dirty.png
A htdocs/img/mood/big-eyes/disappointed.png
A htdocs/img/mood/big-eyes/discontent.png
A htdocs/img/mood/big-eyes/distressed.png
A htdocs/img/mood/big-eyes/ditzy.png
A htdocs/img/mood/big-eyes/dorky.png
A htdocs/img/mood/big-eyes/drained.png
A htdocs/img/mood/big-eyes/drunk.png
A htdocs/img/mood/big-eyes/ecstatic.png
A htdocs/img/mood/big-eyes/embarrassed.png
A htdocs/img/mood/big-eyes/energetic.png
A htdocs/img/mood/big-eyes/enraged.png
A htdocs/img/mood/big-eyes/enthralled.png
A htdocs/img/mood/big-eyes/envious.png
A htdocs/img/mood/big-eyes/exanimate.png
A htdocs/img/mood/big-eyes/excited.png
A htdocs/img/mood/big-eyes/exhausted.png
A htdocs/img/mood/big-eyes/flirty.png
A htdocs/img/mood/big-eyes/frustrated.png
A htdocs/img/mood/big-eyes/full.png
A htdocs/img/mood/big-eyes/geeky.png
A htdocs/img/mood/big-eyes/giddy.png
A htdocs/img/mood/big-eyes/giggly.png
A htdocs/img/mood/big-eyes/gloomy.png
A htdocs/img/mood/big-eyes/good.png
A htdocs/img/mood/big-eyes/grateful.png
A htdocs/img/mood/big-eyes/groggy.png
A htdocs/img/mood/big-eyes/grumpy.png
A htdocs/img/mood/big-eyes/guilty.png
A htdocs/img/mood/big-eyes/happy.png
A htdocs/img/mood/big-eyes/high.png
A htdocs/img/mood/big-eyes/hopeful.png
A htdocs/img/mood/big-eyes/horny.png
A htdocs/img/mood/big-eyes/hot.png
A htdocs/img/mood/big-eyes/hungry.png
A htdocs/img/mood/big-eyes/hyper.png
A htdocs/img/mood/big-eyes/impressed.png
A htdocs/img/mood/big-eyes/indescribable.png
A htdocs/img/mood/big-eyes/indifferent.png
A htdocs/img/mood/big-eyes/infuriated.png
A htdocs/img/mood/big-eyes/intimidated.png
A htdocs/img/mood/big-eyes/irate.png
A htdocs/img/mood/big-eyes/irritated.png
A htdocs/img/mood/big-eyes/jealous.png
A htdocs/img/mood/big-eyes/jubilant.png
A htdocs/img/mood/big-eyes/lazy.png
A htdocs/img/mood/big-eyes/lethargic.png
A htdocs/img/mood/big-eyes/listless.png
A htdocs/img/mood/big-eyes/lonely.png
A htdocs/img/mood/big-eyes/loved.png
A htdocs/img/mood/big-eyes/melancholy.png
A htdocs/img/mood/big-eyes/mellow.png
A htdocs/img/mood/big-eyes/mischievous.png
A htdocs/img/mood/big-eyes/moody.png
A htdocs/img/mood/big-eyes/morose.png
A htdocs/img/mood/big-eyes/naughty.png
A htdocs/img/mood/big-eyes/nauseated.png
A htdocs/img/mood/big-eyes/nerdy.png
A htdocs/img/mood/big-eyes/nervous.png
A htdocs/img/mood/big-eyes/nostalgic.png
A htdocs/img/mood/big-eyes/numb.png
A htdocs/img/mood/big-eyes/okay.png
A htdocs/img/mood/big-eyes/optimistic.png
A htdocs/img/mood/big-eyes/peaceful.png
A htdocs/img/mood/big-eyes/pensive.png
A htdocs/img/mood/big-eyes/pessimistic.png
A htdocs/img/mood/big-eyes/pissed-off.png
A htdocs/img/mood/big-eyes/pleased.png
A htdocs/img/mood/big-eyes/predatory.png
A htdocs/img/mood/big-eyes/productive.png
A htdocs/img/mood/big-eyes/quixotic.png
A htdocs/img/mood/big-eyes/recumbent.png
A htdocs/img/mood/big-eyes/refreshed.png
A htdocs/img/mood/big-eyes/rejected.png
A htdocs/img/mood/big-eyes/rejuvenated.png
A htdocs/img/mood/big-eyes/relaxed.png
A htdocs/img/mood/big-eyes/relieved.png
A htdocs/img/mood/big-eyes/restless.png
A htdocs/img/mood/big-eyes/rushed.png
A htdocs/img/mood/big-eyes/sad.png
A htdocs/img/mood/big-eyes/satisfied.png
A htdocs/img/mood/big-eyes/scared.png
A htdocs/img/mood/big-eyes/shocked.png
A htdocs/img/mood/big-eyes/sick.png
A htdocs/img/mood/big-eyes/silly.png
A htdocs/img/mood/big-eyes/sleepy.png
A htdocs/img/mood/big-eyes/sore.png
A htdocs/img/mood/big-eyes/stressed.png
A htdocs/img/mood/big-eyes/surprised.png
A htdocs/img/mood/big-eyes/sympathetic.png
A htdocs/img/mood/big-eyes/thankful.png
A htdocs/img/mood/big-eyes/thirsty.png
A htdocs/img/mood/big-eyes/thoughtful.png
A htdocs/img/mood/big-eyes/tired.png
A htdocs/img/mood/big-eyes/touched.png
A htdocs/img/mood/big-eyes/uncomfortable.png
A htdocs/img/mood/big-eyes/weird.png
A htdocs/img/mood/big-eyes/working.png
A htdocs/img/mood/big-eyes/worried.png

Log Message:
-----------
[#1462] new moodtheme: angelikitten's Big Eyes

Fixes #1462.

Commit: 6341b19db53709749aeaae68c5fc119926d432d5
https://github.com/dreamwidth/dw-free/commit/6341b19db53709749aeaae68c5fc119926d432d5
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-05 (Wed, 05 Aug 2015)

Changed paths:
M htdocs/moodlist.bml

Log Message:
-----------
Don't load @user_themes for system user

The system user owns all the public mood themes, so trying to
load their "private" themes results in doubled menu items.

This checks to make sure the logged-in user isn't the system user
(yeah, yeah, I know) before populating @user_themes.

Commit: a005dfd65a0ef7e6127ab7f1902e83121cec4c78
https://github.com/dreamwidth/dw-free/commit/a005dfd65a0ef7e6127ab7f1902e83121cec4c78
Author: Mark Smith <mark@qq.is>
Date: 2015-08-05 (Wed, 05 Aug 2015)

Changed paths:
M bin/upgrading/moods.dat
A htdocs/img/mood/big-eyes/accomplished.png
A htdocs/img/mood/big-eyes/aggravated.png
A htdocs/img/mood/big-eyes/amused.png
A htdocs/img/mood/big-eyes/angry.png
A htdocs/img/mood/big-eyes/annoyed.png
A htdocs/img/mood/big-eyes/anxious.png
A htdocs/img/mood/big-eyes/apathetic.png
A htdocs/img/mood/big-eyes/artistic.png
A htdocs/img/mood/big-eyes/awake.png
A htdocs/img/mood/big-eyes/bitchy.png
A htdocs/img/mood/big-eyes/blah.png
A htdocs/img/mood/big-eyes/blank.png
A htdocs/img/mood/big-eyes/bored.png
A htdocs/img/mood/big-eyes/bouncy.png
A htdocs/img/mood/big-eyes/busy.png
A htdocs/img/mood/big-eyes/calm.png
A htdocs/img/mood/big-eyes/cheerful.png
A htdocs/img/mood/big-eyes/chipper.png
A htdocs/img/mood/big-eyes/cold.png
A htdocs/img/mood/big-eyes/complacent.png
A htdocs/img/mood/big-eyes/confused.png
A htdocs/img/mood/big-eyes/contemplative.png
A htdocs/img/mood/big-eyes/content.png
A htdocs/img/mood/big-eyes/cranky.png
A htdocs/img/mood/big-eyes/crappy.png
A htdocs/img/mood/big-eyes/crazy.png
A htdocs/img/mood/big-eyes/creative.png
A htdocs/img/mood/big-eyes/crushed.png
A htdocs/img/mood/big-eyes/curious.png
A htdocs/img/mood/big-eyes/cynical.png
A htdocs/img/mood/big-eyes/depressed.png
A htdocs/img/mood/big-eyes/determined.png
A htdocs/img/mood/big-eyes/devious.png
A htdocs/img/mood/big-eyes/dirty.png
A htdocs/img/mood/big-eyes/disappointed.png
A htdocs/img/mood/big-eyes/discontent.png
A htdocs/img/mood/big-eyes/distressed.png
A htdocs/img/mood/big-eyes/ditzy.png
A htdocs/img/mood/big-eyes/dorky.png
A htdocs/img/mood/big-eyes/drained.png
A htdocs/img/mood/big-eyes/drunk.png
A htdocs/img/mood/big-eyes/ecstatic.png
A htdocs/img/mood/big-eyes/embarrassed.png
A htdocs/img/mood/big-eyes/energetic.png
A htdocs/img/mood/big-eyes/enraged.png
A htdocs/img/mood/big-eyes/enthralled.png
A htdocs/img/mood/big-eyes/envious.png
A htdocs/img/mood/big-eyes/exanimate.png
A htdocs/img/mood/big-eyes/excited.png
A htdocs/img/mood/big-eyes/exhausted.png
A htdocs/img/mood/big-eyes/flirty.png
A htdocs/img/mood/big-eyes/frustrated.png
A htdocs/img/mood/big-eyes/full.png
A htdocs/img/mood/big-eyes/geeky.png
A htdocs/img/mood/big-eyes/giddy.png
A htdocs/img/mood/big-eyes/giggly.png
A htdocs/img/mood/big-eyes/gloomy.png
A htdocs/img/mood/big-eyes/good.png
A htdocs/img/mood/big-eyes/grateful.png
A htdocs/img/mood/big-eyes/groggy.png
A htdocs/img/mood/big-eyes/grumpy.png
A htdocs/img/mood/big-eyes/guilty.png
A htdocs/img/mood/big-eyes/happy.png
A htdocs/img/mood/big-eyes/high.png
A htdocs/img/mood/big-eyes/hopeful.png
A htdocs/img/mood/big-eyes/horny.png
A htdocs/img/mood/big-eyes/hot.png
A htdocs/img/mood/big-eyes/hungry.png
A htdocs/img/mood/big-eyes/hyper.png
A htdocs/img/mood/big-eyes/impressed.png
A htdocs/img/mood/big-eyes/indescribable.png
A htdocs/img/mood/big-eyes/indifferent.png
A htdocs/img/mood/big-eyes/infuriated.png
A htdocs/img/mood/big-eyes/intimidated.png
A htdocs/img/mood/big-eyes/irate.png
A htdocs/img/mood/big-eyes/irritated.png
A htdocs/img/mood/big-eyes/jealous.png
A htdocs/img/mood/big-eyes/jubilant.png
A htdocs/img/mood/big-eyes/lazy.png
A htdocs/img/mood/big-eyes/lethargic.png
A htdocs/img/mood/big-eyes/listless.png
A htdocs/img/mood/big-eyes/lonely.png
A htdocs/img/mood/big-eyes/loved.png
A htdocs/img/mood/big-eyes/melancholy.png
A htdocs/img/mood/big-eyes/mellow.png
A htdocs/img/mood/big-eyes/mischievous.png
A htdocs/img/mood/big-eyes/moody.png
A htdocs/img/mood/big-eyes/morose.png
A htdocs/img/mood/big-eyes/naughty.png
A htdocs/img/mood/big-eyes/nauseated.png
A htdocs/img/mood/big-eyes/nerdy.png
A htdocs/img/mood/big-eyes/nervous.png
A htdocs/img/mood/big-eyes/nostalgic.png
A htdocs/img/mood/big-eyes/numb.png
A htdocs/img/mood/big-eyes/okay.png
A htdocs/img/mood/big-eyes/optimistic.png
A htdocs/img/mood/big-eyes/peaceful.png
A htdocs/img/mood/big-eyes/pensive.png
A htdocs/img/mood/big-eyes/pessimistic.png
A htdocs/img/mood/big-eyes/pissed-off.png
A htdocs/img/mood/big-eyes/pleased.png
A htdocs/img/mood/big-eyes/predatory.png
A htdocs/img/mood/big-eyes/productive.png
A htdocs/img/mood/big-eyes/quixotic.png
A htdocs/img/mood/big-eyes/recumbent.png
A htdocs/img/mood/big-eyes/refreshed.png
A htdocs/img/mood/big-eyes/rejected.png
A htdocs/img/mood/big-eyes/rejuvenated.png
A htdocs/img/mood/big-eyes/relaxed.png
A htdocs/img/mood/big-eyes/relieved.png
A htdocs/img/mood/big-eyes/restless.png
A htdocs/img/mood/big-eyes/rushed.png
A htdocs/img/mood/big-eyes/sad.png
A htdocs/img/mood/big-eyes/satisfied.png
A htdocs/img/mood/big-eyes/scared.png
A htdocs/img/mood/big-eyes/shocked.png
A htdocs/img/mood/big-eyes/sick.png
A htdocs/img/mood/big-eyes/silly.png
A htdocs/img/mood/big-eyes/sleepy.png
A htdocs/img/mood/big-eyes/sore.png
A htdocs/img/mood/big-eyes/stressed.png
A htdocs/img/mood/big-eyes/surprised.png
A htdocs/img/mood/big-eyes/sympathetic.png
A htdocs/img/mood/big-eyes/thankful.png
A htdocs/img/mood/big-eyes/thirsty.png
A htdocs/img/mood/big-eyes/thoughtful.png
A htdocs/img/mood/big-eyes/tired.png
A htdocs/img/mood/big-eyes/touched.png
A htdocs/img/mood/big-eyes/uncomfortable.png
A htdocs/img/mood/big-eyes/weird.png
A htdocs/img/mood/big-eyes/working.png
A htdocs/img/mood/big-eyes/worried.png
M htdocs/moodlist.bml

Log Message:
-----------
Merge pull request #1512 from kareila/1462-moodtheme

[#1462] new moodtheme: angelikitten's Big Eyes

Commit: 7cd58fcf18823b192f0c07125db6bd02d8b14aca
https://github.com/dreamwidth/dw-free/commit/7cd58fcf18823b192f0c07125db6bd02d8b14aca
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-05 (Wed, 05 Aug 2015)

Changed paths:
M cgi-bin/DW/External/Userinfo.pm

Log Message:
-----------
[#1463] Add code for parsing lj.rossia.org results to DW::External::Userinfo::atomtype

Their atom feeds look different than those from other LJ-related sites,
so look at a different portion of the metadata to discover the URL
for determining journal type. Still easier than parsing their
profile pages, which are in Cyrillic...

Related to but separate from work being done in DW::External::Site (#1506)
to support this site in our external user tags.

Commit: c33556eab5006957981e183119e51f59ba91d06c
https://github.com/dreamwidth/dw-free/commit/c33556eab5006957981e183119e51f59ba91d06c
Author: Adam <disconcertedape+dw@gmail.com>
Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths:
M cgi-bin/DW/External/Site.pm
A cgi-bin/DW/External/Site/LJRossia.pm
A htdocs/img/external/ljr-community.gif
A htdocs/img/external/ljr-syndicated.gif
A htdocs/img/external/ljr-userinfo.gif

Log Message:
-----------
Added a DW/External/Site/LJRossia.pm ; updated DW/External/Site.pm to cope with three-part URLS

add local copies of icons; change type to lj.

Commit: 7d37f48b5bcee2bc4609de336be404c1eb636fd9
https://github.com/dreamwidth/dw-free/commit/7d37f48b5bcee2bc4609de336be404c1eb636fd9
Author: Adam <disconcertedape+dw@gmail.com>
Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths:
A cgi-bin/DW/Console/Command/ResetPBEMToken.pm
M etc/config.pl

Log Message:
-----------
Added module for new command to reset user's email

Commit: 0273cba484c74128942db2da2c7a2613a8440e90
https://github.com/dreamwidth/dw-free/commit/0273cba484c74128942db2da2c7a2613a8440e90
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths:
M cgi-bin/DW/External/Site.pm
A cgi-bin/DW/External/Site/LJRossia.pm
A htdocs/img/external/ljr-community.gif
A htdocs/img/external/ljr-syndicated.gif
A htdocs/img/external/ljr-userinfo.gif

Log Message:
-----------
Merge pull request #1506 from pseudomonas/LJdotRossia-bug-1463

Add external site support for lj.rossia.org

Fixes #1463.

Commit: 1999447153349c5ee5d184ee56a4c480753e51c7
https://github.com/dreamwidth/dw-free/commit/1999447153349c5ee5d184ee56a4c480753e51c7
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths:
M cgi-bin/DW/External/Userinfo.pm

Log Message:
-----------
Merge pull request #1514 from kareila/1463-ljr-journaltype

[#1463] Add code for parsing lj.rossia.org results to DW::External::Userinfo

Commit: 13eb34626a66bcb51b4f1495200aee9626e4681f
https://github.com/dreamwidth/dw-free/commit/13eb34626a66bcb51b4f1495200aee9626e4681f
Author: kaberett <kaberett@dreamwidth.org>
Date: 2015-08-06 (Thu, 06 Aug 2015)

Changed paths:
M htdocs/editjournal.bml
M views/entry/success.tt

Log Message:
-----------
Remove extra info on deletion success

When entries have been deleted they don't need extra data
for security and subject.

Fixes #1445.

Commit: d80d22c8c95cdd36c2e6c47d6abb8b869577804c
https://github.com/dreamwidth/dw-free/commit/d80d22c8c95cdd36c2e6c47d6abb8b869577804c
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-07 (Fri, 07 Aug 2015)

Changed paths:
M htdocs/editjournal.bml
M views/entry/success.tt

Log Message:
-----------
Merge pull request #1515 from kaberett/entry-success-landing-page

Remove extra info on deletion success

Commit: 6c7fb3585016b70e523867f55fc8f77adefb3f5d
https://github.com/dreamwidth/dw-free/commit/6c7fb3585016b70e523867f55fc8f77adefb3f5d
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-08-08 (Sat, 08 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Hide subscription options for non-visible accounts

When offering tracking subscription options for an account with a status
other than "visible", only offer notification of when the account is
purged. In particular, don't offer notification of when a new post with
a specific tag is made, since that includes the list of tags from a
deleted account.

Fixes #1523.

Commit: bfc89c7664b0ccc6b5997cf79516ef12e0a60c0d
https://github.com/dreamwidth/dw-free/commit/bfc89c7664b0ccc6b5997cf79516ef12e0a60c0d
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-08-08 (Sat, 08 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Trivial whitespace fix

Commit: 70605ec3d038d4fddc10ea2b22f5f68313a2a231
https://github.com/dreamwidth/dw-free/commit/70605ec3d038d4fddc10ea2b22f5f68313a2a231
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-08 (Sat, 08 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M cgi-bin/DW/User/Rename.pm
M t/rename.t
M views/rename/swap.tt

Log Message:
-----------
[#1374] allow rename swaps to use tokens from either account

Updates DW::User::Rename::swap_usernames to validate tokens from any
of the (up to three) accounts involved in a username swap, instead
of only using the available tokens for the logged in account.

Also redesigns the /rename/swap page to present the form immediately,
and treat the "too few tokens" error like any other form processing
error. This was necessary in order to check the requested target
account(s) for available tokens.

Fixes #1374.

Commit: aed7d2d452c6fb70e936ec70a87cd9ffe7b273c7
https://github.com/dreamwidth/dw-free/commit/aed7d2d452c6fb70e936ec70a87cd9ffe7b273c7
Author: pseudomonas <disconcertedape+github@gmail.com>
Date: 2015-08-08 (Sat, 08 Aug 2015)

Changed paths:
M cgi-bin/DW/Console/Command/ResetPBEMToken.pm

Log Message:
-----------
Two minor fixes as requested.

Commit: e481041fb1600daaf7f0d59aa1622f4aa48caaf9
https://github.com/dreamwidth/dw-free/commit/e481041fb1600daaf7f0d59aa1622f4aa48caaf9
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-08-09 (Sun, 09 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Use `&&` in preference to `and`

`&&` has higher precedence than `and` and is therefore preferable in
this circumstance.

Commit: 2db25a52088f871ca705da5e83203ea864e9898b
https://github.com/dreamwidth/dw-free/commit/2db25a52088f871ca705da5e83203ea864e9898b
Author: Mark Smith <mark@qq.is>
Date: 2015-08-08 (Sat, 08 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Merge pull request #1525 from me-and/1523-hide-deleted-account-tags

Hide subscription options for non-visible accounts

Commit: e5c91b8805bd16c8e17aeb5da5d15daad23037b0
https://github.com/dreamwidth/dw-free/commit/e5c91b8805bd16c8e17aeb5da5d15daad23037b0
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Protocol.pm
M cgi-bin/LJ/Tags.pm
M t/protocol.t

Log Message:
-----------
[#1356] remove "identity_posting" userprop and related checks

The legacy userprop "identity_posting" was intended to allow community
admins to opt into allowing OpenID users to post entries and manage
tags. Since we decided to allow this for all OpenID users across
the site, this removes the userprop and all the permission checks
that were failing as a result of it not being set.

The relevant tests in protocol.t have been updated, but that test
suite is still set to be skipped because of inconsistent results
in other parts of the test suite.

Fixes #1356.

Commit: a4b7b8efb927f18c647c7e7898f3bd7a71bce39d
https://github.com/dreamwidth/dw-free/commit/a4b7b8efb927f18c647c7e7898f3bd7a71bce39d
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Improve code clarity

Use `journal->is_visible` in preference to `journal->statusvis eq "V"`
-- the former is considerably more readable.

Commit: 08de1c989a2f04ac5847a09f4449c655fb2ca4ef
https://github.com/dreamwidth/dw-free/commit/08de1c989a2f04ac5847a09f4449c655fb2ca4ef
Author: Adam Dinwoodie <adam@dinwoodie.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
R README
A README.md

Log Message:
-----------
Rewrite README into Markdown

The repository README was already almost in Markdown format. Polish it
up a bit further into that format, and rename it to use an extension
that will cause GitHub to parse and display the file as Markdown.

Commit: e8c1ed3db7a7c63cf7408406cbdf32e212dce6ac
https://github.com/dreamwidth/dw-free/commit/e8c1ed3db7a7c63cf7408406cbdf32e212dce6ac
Author: Sean <sgsabbage@gmail.com>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M cgi-bin/DW/Hooks/EmbedWhitelist.pm
M t/embed-whitelist.t

Log Message:
-----------
Fixes #1497, whitelists screen.yahoo.com for embeds

Commit: 6440be12bda230117f1eef2c30d4de56024e3b2d
https://github.com/dreamwidth/dw-free/commit/6440be12bda230117f1eef2c30d4de56024e3b2d
Author: Sean <sgsabbage@gmail.com>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M cgi-bin/DW/Hooks/EmbedWhitelist.pm
M t/embed-whitelist.t

Log Message:
-----------
Fixes #1499 - whitelist embeds from ZippCast

Commit: 8bfa18cc6893d3d8d6467d19f5e4be8854d6dd20
https://github.com/dreamwidth/dw-free/commit/8bfa18cc6893d3d8d6467d19f5e4be8854d6dd20
Author: Sean <sgsabbage@gmail.com>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M cgi-bin/DW/Hooks/EmbedWhitelist.pm

Log Message:
-----------
Whitespace fix

Commit: 4ef7ac4ef53a5b635de4b18a887c7a581edb74eb
https://github.com/dreamwidth/dw-free/commit/4ef7ac4ef53a5b635de4b18a887c7a581edb74eb
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Rename.pm
M cgi-bin/DW/User/Rename.pm
M t/rename.t
M views/rename/swap.tt

Log Message:
-----------
Merge pull request #1526 from kareila/1374-rename-tokens

[#1374] allow rename swaps to use tokens from either account

Commit: 50a6c3641f4d4775d65df40452432567fffaf134
https://github.com/dreamwidth/dw-free/commit/50a6c3641f4d4775d65df40452432567fffaf134
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M htdocs/manage/tracking/user.bml

Log Message:
-----------
Merge pull request #1530 from me-and/1523-hide-deleted-account-tags

Improve code clarity by using is_visible instead of checking the value of statusvis.

Commit: c093db0007a03993995fc84388db5596ce76e94b
https://github.com/dreamwidth/dw-free/commit/c093db0007a03993995fc84388db5596ce76e94b
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
R README
A README.md

Log Message:
-----------
Merge pull request #1531 from me-and/readme-markdown

Rewrite README into Markdown

Commit: 71a1a5578acb873108f11f760f78fd81f759a59d
https://github.com/dreamwidth/dw-free/commit/71a1a5578acb873108f11f760f78fd81f759a59d
Author: Mark Smith <mark@qq.is>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Protocol.pm
M cgi-bin/LJ/Tags.pm
M t/protocol.t

Log Message:
-----------
Merge pull request #1533 from kareila/1356-openid-tagging

[#1356] remove "identity_posting" userprop and related checks

Commit: d95b994921b813ea3c04cee79d0e9079cdc83e43
https://github.com/dreamwidth/dw-free/commit/d95b994921b813ea3c04cee79d0e9079cdc83e43
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-10 (Mon, 10 Aug 2015)

Changed paths:
M cgi-bin/DW/Hooks/EmbedWhitelist.pm
M t/embed-whitelist.t

Log Message:
-----------
Merge pull request #1532 from sgsabbage/yahoo-zipcast-whitelist

Whitelisting for screen.yahoo.com and www.zippcast.com

Fixes #1497 and also fixes #1499.

Commit: 1b9b9cc888b3adcb1a075b15ab0cc56a4a6168a0
https://github.com/dreamwidth/dw-free/commit/1b9b9cc888b3adcb1a075b15ab0cc56a4a6168a0
Author: Sean Sabbage <sgsabbage@gmail.com>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M cgi-bin/DW/Console/Command/BonusIcons.pm
M cgi-bin/DW/Console/Command/Note.pm
M cgi-bin/LJ/Console/Command/FaqCat.pm

Log Message:
-----------
Fixes #1466, greys out additional commands. Priv check for faqcat also moved to encompass list.

Commit: a96a935f09c03ef0c5c469d0c2d863d13818e13b
https://github.com/dreamwidth/dw-free/commit/a96a935f09c03ef0c5c469d0c2d863d13818e13b
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M htdocs/admin/faq/faqedit.bml

Log Message:
-----------
[#1524] remove modification level dropdowns from faqedit

Always use severity zero instead of prompting the user to choose.

Fixes #1524.

Commit: f49d1186afd3fa94989e7af873c6ff1d188dfacb
https://github.com/dreamwidth/dw-free/commit/f49d1186afd3fa94989e7af873c6ff1d188dfacb
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/DW/Controller/Support/History.pm
M cgi-bin/DW/Template/Plugin/FormHTML.pm
M cgi-bin/DW/User/Edges/WatchTrust.pm
M cgi-bin/LJ/Lang.pm

Log Message:
-----------
Fix uninitialized value warnings

Use of uninitialized value in addition (+) ... cgi-bin/DW/Controller/Support/History.pm line 107.

Use of uninitialized value within %opts in lc ... cgi-bin/DW/User/Edges/WatchTrust.pm line 712.

Use of uninitialized value in list assignment ... cgi-bin/DW/Template/Plugin/FormHTML.pm line 112.

Use of uninitialized value in list assignment ... cgi-bin/DW/Template/Plugin/FormHTML.pm line 156.

Use of uninitialized value in hash element ... cgi-bin/DW/Controller/Entry.pm line 743.

Use of uninitialized value in addition (+) ... cgi-bin/LJ/Lang.pm line 403.

Use of uninitialized value in addition (+) ... cgi-bin/LJ/Lang.pm line 419.

Commit: 0b5219e16fe8df21e5ccbd11af1f23eaa3b33aa0
https://github.com/dreamwidth/dw-free/commit/0b5219e16fe8df21e5ccbd11af1f23eaa3b33aa0
Author: kaberett <kaberett@dreamwidth.org>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M htdocs/edittags.bml
M htdocs/edittags.bml.text

Log Message:
-----------
Add poster name to Edit Tags page

Fixes #1509.

Provides name of poster on dedicated Edit Tags page - useful/
of interest when managing community tags.

This is still BML and I should learn to fix it.

Commit: 096002e69652bf42bff5cd5ef4e047a5b121dd45
https://github.com/dreamwidth/dw-free/commit/096002e69652bf42bff5cd5ef4e047a5b121dd45
Author: Mark Smith <mark@qq.is>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M htdocs/admin/faq/faqedit.bml

Log Message:
-----------
Merge pull request #1535 from kareila/1524-faqedit

[#1524] remove modification level dropdowns from faqedit

Commit: 7183d1c85e93fc041df272ded85884c26a2c66d3
https://github.com/dreamwidth/dw-free/commit/7183d1c85e93fc041df272ded85884c26a2c66d3
Author: Mark Smith <mark@qq.is>
Date: 2015-08-11 (Tue, 11 Aug 2015)

Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/DW/Controller/Support/History.pm
M cgi-bin/DW/Template/Plugin/FormHTML.pm
M cgi-bin/DW/User/Edges/WatchTrust.pm
M cgi-bin/LJ/Lang.pm

Log Message:
-----------
Merge pull request #1536 from kareila/cleanup-2015q3

Fix uninitialized value warnings

Commit: f011cc67e308d37d309e7db9f3df67cf494f4e4c
https://github.com/dreamwidth/dw-free/commit/f011cc67e308d37d309e7db9f3df67cf494f4e4c
Author: Sean Sabbage <sgsabbage@gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/support/faqbrowse.bml

Log Message:
-----------
Closes #1517, adds TOC to faqlist when browsing by cat

Commit: e781992ee3ed693ef9d918c9a30d16e1691e63a3
https://github.com/dreamwidth/dw-free/commit/e781992ee3ed693ef9d918c9a30d16e1691e63a3
Author: Sean Sabbage <sgsabbage@gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/support/faqbrowse.bml

Log Message:
-----------
Changed name to id and made empty. HTML5 compat

Commit: bc2e85cdf21efb7ed01aa49b650da2c52633272e
https://github.com/dreamwidth/dw-free/commit/bc2e85cdf21efb7ed01aa49b650da2c52633272e
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/edittags.bml
M htdocs/edittags.bml.text

Log Message:
-----------
Merge pull request #1521 from kaberett/edit-tags-info

Add poster name to Edit Tags page

Commit: 6756007bb5a4f98515efdb663f63cd88c1857b4f
https://github.com/dreamwidth/dw-free/commit/6756007bb5a4f98515efdb663f63cd88c1857b4f
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/js/pages/entry/new.js

Log Message:
-----------
[#1500] fix retrieval of previously selected security level in JS

The existing syntax wasn't successfully defining the variable.

I figured out a working syntax using StackOverflow. HURRAY.

Fixes #1500.

Commit: 6c95de73b67f119ae90f2f739c28eb36477d68fa
https://github.com/dreamwidth/dw-free/commit/6c95de73b67f119ae90f2f739c28eb36477d68fa
Author: Sean Sabbage <sgsabbage@gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M cgi-bin/LJ/Web.pm

Log Message:
-----------
Fixes #1539. Displays 'Default' filter as selected correctly

Commit: b6ad109975d48f4278318b4e976423b732952292
https://github.com/dreamwidth/dw-free/commit/b6ad109975d48f4278318b4e976423b732952292
Author: Kareila <kareila@dreamwidth.org>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/js/pages/entry/new.js

Log Message:
-----------
[#1500] remove now-unused variable "lastselected"

Since we're not retrieving it later, we don't need to set it earlier.
The new way queries the document directly for the selection state
instead of unsuccessfully passing a stored value around.

Commit: dbb2a0fefba01c166a7befee254f6f4a385fc784
https://github.com/dreamwidth/dw-free/commit/dbb2a0fefba01c166a7befee254f6f4a385fc784
Author: Mark Smith <mark@qq.is>
Date: 2015-08-12 (Wed, 12 Aug 2015)

Changed paths:
M htdocs/js/pages/entry/new.js

Log Message:
-----------
Merge pull request #1538 from kareila/1500-js-select

[#1500] fix retrieval of previously selected security level in JS

Commit: 03267b330a12bb0b2bb7affe579fb8e3342c82e1
https://github.com/dreamwidth/dw-free/commit/03267b330a12bb0b2bb7affe579fb8e3342c82e1
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-13 (Thu, 13 Aug 2015)

Changed paths:
M cgi-bin/DW/Console/Command/BonusIcons.pm
M cgi-bin/DW/Console/Command/Note.pm
M cgi-bin/LJ/Console/Command/FaqCat.pm

Log Message:
-----------
Merge pull request #1534 from sgsabbage/1466-command-reference-unavailable

Fixes #1466, greys out additional commands

Commit: 94920f2f865a89a2230103d9185c5c94d71c0d07
https://github.com/dreamwidth/dw-free/commit/94920f2f865a89a2230103d9185c5c94d71c0d07
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-13 (Thu, 13 Aug 2015)

Changed paths:
M cgi-bin/LJ/Web.pm

Log Message:
-----------
Merge pull request #1540 from sgsabbage/1539-default-filter-view

[#1539] Displays 'Default' filter as selected correctly

Commit: 9acf3ca9fcfbf7afe8f255822658b91367ae9649
https://github.com/dreamwidth/dw-free/commit/9acf3ca9fcfbf7afe8f255822658b91367ae9649
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-13 (Thu, 13 Aug 2015)

Changed paths:
M htdocs/support/faqbrowse.bml

Log Message:
-----------
Merge pull request #1537 from sgsabbage/1517-faq-toc

Closes #1517, adds TOC to faqlist when browsing by cat

Commit: 4ade42c836a881be8da3e9c348e9ff6d10e34ae6
https://github.com/dreamwidth/dw-free/commit/4ade42c836a881be8da3e9c348e9ff6d10e34ae6
Author: Jen <kareila@dreamwidth.org>
Date: 2015-08-13 (Thu, 13 Aug 2015)

Changed paths:
A cgi-bin/DW/Console/Command/ResetPBEMToken.pm
M etc/config.pl

Log Message:
-----------
Merge pull request #1507 from pseudomonas/Reset_PBEM_token-bug-1464

Reset pbem token - Fixes #1464

Compare: https://github.com/dreamwidth/dw-free/compare/2d528dd1462a...4ade42c836a8