[dreamwidth/dw-free] 93a2d8: (Bug 110) Initial import of old backend patch
Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 93a2d87186cf9fc5472dfe74b4647ef045325cfe
https://github.com/dreamwidth/dw-free/commit/93a2d87186cf9fc5472dfe74b4647ef045325cfe
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
Log Message:
-----------
(Bug 110) Initial import of old backend patch
Commit: 873cb571c0c718b83e23bad342422c88962dfccd
https://github.com/dreamwidth/dw-free/commit/873cb571c0c718b83e23bad342422c88962dfccd
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M styles/core2.s2
Log Message:
-----------
(Bug 110) Clean up stuff
Commit: 1f13be21785720d62b4bc7cb03a110d75e864376
https://github.com/dreamwidth/dw-free/commit/1f13be21785720d62b4bc7cb03a110d75e864376
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
A views/entry/module-community.tt
A views/entry/module-community.tt.text
Log Message:
-----------
(bug 110) Add final frontend bits.
Commit: aed5316c5ab1a30dcde379ae132861d853bc10fe
https://github.com/dreamwidth/dw-free/commit/aed5316c5ab1a30dcde379ae132861d853bc10fe
Author: kaberett/Alex
Home: https://github.com/dreamwidth/dw-free
Commit: 93a2d87186cf9fc5472dfe74b4647ef045325cfe
https://github.com/dreamwidth/dw-free/commit/93a2d87186cf9fc5472dfe74b4647ef045325cfe
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
Log Message:
-----------
(Bug 110) Initial import of old backend patch
Commit: 873cb571c0c718b83e23bad342422c88962dfccd
https://github.com/dreamwidth/dw-free/commit/873cb571c0c718b83e23bad342422c88962dfccd
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M styles/core2.s2
Log Message:
-----------
(Bug 110) Clean up stuff
Commit: 1f13be21785720d62b4bc7cb03a110d75e864376
https://github.com/dreamwidth/dw-free/commit/1f13be21785720d62b4bc7cb03a110d75e864376
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
A views/entry/module-community.tt
A views/entry/module-community.tt.text
Log Message:
-----------
(bug 110) Add final frontend bits.
Commit: aed5316c5ab1a30dcde379ae132861d853bc10fe
https://github.com/dreamwidth/dw-free/commit/aed5316c5ab1a30dcde379ae132861d853bc10fe
Author: kaberett/Alex
[Error: Irreparable invalid markup ('<newhack.dreamwidth.net>') in entry. Owner must fix manually. Raw contents below.]
Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 93a2d87186cf9fc5472dfe74b4647ef045325cfe
https://github.com/dreamwidth/dw-free/commit/93a2d87186cf9fc5472dfe74b4647ef045325cfe
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
Log Message:
-----------
(Bug 110) Initial import of old backend patch
Commit: 873cb571c0c718b83e23bad342422c88962dfccd
https://github.com/dreamwidth/dw-free/commit/873cb571c0c718b83e23bad342422c88962dfccd
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M styles/core2.s2
Log Message:
-----------
(Bug 110) Clean up stuff
Commit: 1f13be21785720d62b4bc7cb03a110d75e864376
https://github.com/dreamwidth/dw-free/commit/1f13be21785720d62b4bc7cb03a110d75e864376
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
A views/entry/module-community.tt
A views/entry/module-community.tt.text
Log Message:
-----------
(bug 110) Add final frontend bits.
Commit: aed5316c5ab1a30dcde379ae132861d853bc10fe
https://github.com/dreamwidth/dw-free/commit/aed5316c5ab1a30dcde379ae132861d853bc10fe
Author: kaberett/Alex <newhack.dreamwidth.net>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/Apache/LiveJournal.pm
Log Message:
-----------
(Bug 4260) Redirect .htm to .html
Redirect .htm to .html, without dropping arguments,
with case insensitivity (as requested by Azz in
Bugzilla comments).
Commit: a22cfec36da35f52191b241c7f577f073ecb66af
https://github.com/dreamwidth/dw-free/commit/a22cfec36da35f52191b241c7f577f073ecb66af
Author: Afuna <fu@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/LJ/S2.pm
Log Message:
-----------
(Bug 5161) Switch styleid to siteviews instead of user's style
* we do this if the user has in their preference to use site skinned
comment pages, rather than custom comment pages
* old way was to return to the caller telling the caller to use bml, and
have the caller call LJ::S2::make_journal again. But siteviews is s2
anyway, so we might as well set the right variables and continue on
Commit: a874947ef5b6e39a28f9699d4b868cfd2d396c13
https://github.com/dreamwidth/dw-free/commit/a874947ef5b6e39a28f9699d4b868cfd2d396c13
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/LJ/S2.pm
Log Message:
-----------
Merge pull request #509 from afuna/bug5161-handle-siteviews-from-options
(Bug 5161) Switch styleid to siteviews instead of user's style
Commit: 2342d15c38c9b72cb3f20bb375bb0f1d1b62f19c
https://github.com/dreamwidth/dw-free/commit/2342d15c38c9b72cb3f20bb375bb0f1d1b62f19c
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
R views/entry/module-community.tt
R views/entry/module-community.tt.text
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
(bug 110) Rename module, only show for communities
Commit: 9b9f752730cd34346275748631dcf5a0bf9f22f7
https://github.com/dreamwidth/dw-free/commit/9b9f752730cd34346275748631dcf5a0bf9f22f7
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M views/admin/feeds/merge.tt
Log Message:
-----------
(bug 1716) "syn_merge" not "synmerge"
Commit: 7318b911b8ccee30266c3f7e73bad647df90dd41
https://github.com/dreamwidth/dw-free/commit/7318b911b8ccee30266c3f7e73bad647df90dd41
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm
Log Message:
-----------
(bug 1716) use canonical username in merge interface lookups
Commit: 9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
https://github.com/dreamwidth/dw-free/commit/9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
Author: Mark Smith <mark@qq.is>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm
M views/admin/feeds/merge.tt
Log Message:
-----------
Merge pull request #511 from anall/feature/bug1716
Fix two issues with feed merge admin interface.
Commit: d50f78ce2b4d875f9e1cecbcfe24b9a52c6d65e8
https://github.com/dreamwidth/dw-free/commit/d50f78ce2b4d875f9e1cecbcfe24b9a52c6d65e8
Author: Afuna <fu@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M htdocs/js/contextualhover.js
Log Message:
-----------
(Bug 4981) Move confirmation to earlier in the process
Commit: 8ff3f27fd3475497b483ab2d53ddd7e2182ca8ab
https://github.com/dreamwidth/dw-free/commit/8ff3f27fd3475497b483ab2d53ddd7e2182ca8ab
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M htdocs/js/contextualhover.js
Log Message:
-----------
Merge pull request #512 from afuna/bug4981-move-confirm
(Bug 4981) Move confirmation to earlier in the process
Commit: 2bb955ffa474df2bc81126d7d9ccf373bebf805a
https://github.com/dreamwidth/dw-free/commit/2bb955ffa474df2bc81126d7d9ccf373bebf805a
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/js/jquery.postform.js
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
Merge pull request #507 from anall/feature/Bug110
(bug 110) ADMIN HATS!
Commit: c0264feabbe16925968986047cc18f726087eba6
https://github.com/dreamwidth/dw-free/commit/c0264feabbe16925968986047cc18f726087eba6
Author: Robby Griffin <alierak@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Shop/Engine/CreditCard.pm
Log Message:
-----------
(Bug 5199) set jobstate to queued only if null
After credit card charge job is queued, always set dispatchtime, but
avoid overwriting jobstate and gctaskref when shop-creditcard-charge
worker has already finished and updated those.
Commit: 16cb161c50ea9b2ad3b9dcaf96eb473b53b6e7e5
https://github.com/dreamwidth/dw-free/commit/16cb161c50ea9b2ad3b9dcaf96eb473b53b6e7e5
Author: Mark Smith <mark@dreamwidth.org>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/Apache/LiveJournal.pm
M cgi-bin/DW/Controller/Admin/Feeds.pm
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/js/contextualhover.js
M htdocs/js/jquery.postform.js
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
M views/admin/feeds/merge.tt
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
Merge branch 'release-1.17' into develop
Compare: https://github.com/dreamwidth/dw-free/compare/40a08982fa67...16cb161c50ea
Home: https://github.com/dreamwidth/dw-free
Commit: 93a2d87186cf9fc5472dfe74b4647ef045325cfe
https://github.com/dreamwidth/dw-free/commit/93a2d87186cf9fc5472dfe74b4647ef045325cfe
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
Log Message:
-----------
(Bug 110) Initial import of old backend patch
Commit: 873cb571c0c718b83e23bad342422c88962dfccd
https://github.com/dreamwidth/dw-free/commit/873cb571c0c718b83e23bad342422c88962dfccd
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M styles/core2.s2
Log Message:
-----------
(Bug 110) Clean up stuff
Commit: 1f13be21785720d62b4bc7cb03a110d75e864376
https://github.com/dreamwidth/dw-free/commit/1f13be21785720d62b4bc7cb03a110d75e864376
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
A views/entry/module-community.tt
A views/entry/module-community.tt.text
Log Message:
-----------
(bug 110) Add final frontend bits.
Commit: aed5316c5ab1a30dcde379ae132861d853bc10fe
https://github.com/dreamwidth/dw-free/commit/aed5316c5ab1a30dcde379ae132861d853bc10fe
Author: kaberett/Alex <newhack.dreamwidth.net>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M cgi-bin/Apache/LiveJournal.pm
Log Message:
-----------
(Bug 4260) Redirect .htm to .html
Redirect .htm to .html, without dropping arguments,
with case insensitivity (as requested by Azz in
Bugzilla comments).
Commit: a22cfec36da35f52191b241c7f577f073ecb66af
https://github.com/dreamwidth/dw-free/commit/a22cfec36da35f52191b241c7f577f073ecb66af
Author: Afuna <fu@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/LJ/S2.pm
Log Message:
-----------
(Bug 5161) Switch styleid to siteviews instead of user's style
* we do this if the user has in their preference to use site skinned
comment pages, rather than custom comment pages
* old way was to return to the caller telling the caller to use bml, and
have the caller call LJ::S2::make_journal again. But siteviews is s2
anyway, so we might as well set the right variables and continue on
Commit: a874947ef5b6e39a28f9699d4b868cfd2d396c13
https://github.com/dreamwidth/dw-free/commit/a874947ef5b6e39a28f9699d4b868cfd2d396c13
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/LJ/S2.pm
Log Message:
-----------
Merge pull request #509 from afuna/bug5161-handle-siteviews-from-options
(Bug 5161) Switch styleid to siteviews instead of user's style
Commit: 2342d15c38c9b72cb3f20bb375bb0f1d1b62f19c
https://github.com/dreamwidth/dw-free/commit/2342d15c38c9b72cb3f20bb375bb0f1d1b62f19c
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/User.pm
M htdocs/js/jquery.postform.js
R views/entry/module-community.tt
R views/entry/module-community.tt.text
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
(bug 110) Rename module, only show for communities
Commit: 9b9f752730cd34346275748631dcf5a0bf9f22f7
https://github.com/dreamwidth/dw-free/commit/9b9f752730cd34346275748631dcf5a0bf9f22f7
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M views/admin/feeds/merge.tt
Log Message:
-----------
(bug 1716) "syn_merge" not "synmerge"
Commit: 7318b911b8ccee30266c3f7e73bad647df90dd41
https://github.com/dreamwidth/dw-free/commit/7318b911b8ccee30266c3f7e73bad647df90dd41
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm
Log Message:
-----------
(bug 1716) use canonical username in merge interface lookups
Commit: 9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
https://github.com/dreamwidth/dw-free/commit/9241c2004bb64f79b38a4ec59c66ecfe9eeea25c
Author: Mark Smith <mark@qq.is>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Controller/Admin/Feeds.pm
M views/admin/feeds/merge.tt
Log Message:
-----------
Merge pull request #511 from anall/feature/bug1716
Fix two issues with feed merge admin interface.
Commit: d50f78ce2b4d875f9e1cecbcfe24b9a52c6d65e8
https://github.com/dreamwidth/dw-free/commit/d50f78ce2b4d875f9e1cecbcfe24b9a52c6d65e8
Author: Afuna <fu@dreamwidth.org>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M htdocs/js/contextualhover.js
Log Message:
-----------
(Bug 4981) Move confirmation to earlier in the process
Commit: 8ff3f27fd3475497b483ab2d53ddd7e2182ca8ab
https://github.com/dreamwidth/dw-free/commit/8ff3f27fd3475497b483ab2d53ddd7e2182ca8ab
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M htdocs/js/contextualhover.js
Log Message:
-----------
Merge pull request #512 from afuna/bug4981-move-confirm
(Bug 4981) Move confirmation to earlier in the process
Commit: 2bb955ffa474df2bc81126d7d9ccf373bebf805a
https://github.com/dreamwidth/dw-free/commit/2bb955ffa474df2bc81126d7d9ccf373bebf805a
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/js/jquery.postform.js
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
Merge pull request #507 from anall/feature/Bug110
(bug 110) ADMIN HATS!
Commit: c0264feabbe16925968986047cc18f726087eba6
https://github.com/dreamwidth/dw-free/commit/c0264feabbe16925968986047cc18f726087eba6
Author: Robby Griffin <alierak@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M cgi-bin/DW/Shop/Engine/CreditCard.pm
Log Message:
-----------
(Bug 5199) set jobstate to queued only if null
After credit card charge job is queued, always set dispatchtime, but
avoid overwriting jobstate and gctaskref when shop-creditcard-charge
worker has already finished and updated those.
Commit: 16cb161c50ea9b2ad3b9dcaf96eb473b53b6e7e5
https://github.com/dreamwidth/dw-free/commit/16cb161c50ea9b2ad3b9dcaf96eb473b53b6e7e5
Author: Mark Smith <mark@dreamwidth.org>
Date: 2013-07-22 (Mon, 22 Jul 2013)
Changed paths:
M bin/upgrading/proplists.dat
M cgi-bin/Apache/LiveJournal.pm
M cgi-bin/DW/Controller/Admin/Feeds.pm
M cgi-bin/DW/Controller/Entry.pm
M cgi-bin/LJ/Comment.pm
M cgi-bin/LJ/Entry.pm
M cgi-bin/LJ/Global/Img.pm
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2/EntryPage.pm
M cgi-bin/LJ/S2/ReplyPage.pm
M cgi-bin/LJ/Talk.pm
M cgi-bin/LJ/User.pm
A htdocs/img/silk/entry/admin_post.png
M htdocs/js/contextualhover.js
M htdocs/js/jquery.postform.js
M htdocs/talkread.bml.text
M styles/core2.s2
M styles/siteviews/layout.s2
M views/admin/feeds/merge.tt
A views/entry/module-flags.tt
A views/entry/module-flags.tt.text
Log Message:
-----------
Merge branch 'release-1.17' into develop
Compare: https://github.com/dreamwidth/dw-free/compare/40a08982fa67...16cb161c50ea
