aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-09 11:33:14 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-09 11:33:14 +0000
commit179c77ccddcd8bd4df2f29d05b460c6365396d49 (patch)
tree872b58682c59b2e3400fe841e541b5a8c9455db7 /phpBB/docs
parentc923e4191a28026a21c0ebb0dd2120c258d96229 (diff)
downloadforums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar
forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.gz
forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.bz2
forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.xz
forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.zip
- do not include if there are no files fetched with glob()
- allow options for merged files on update (merge, new file, old file) git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/CHANGELOG.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index bb1ace4c49..1b4cbf8f91 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -188,6 +188,7 @@ p a {
<ul class="menu">
<li>[Fix] Parse error in MCP ban (Bug #13109)</li>
<li>[Fix] Correctly hide online status in the profile (Bug #13059)</li>
+ <li>[Feature] Let the user choose how to update modified files (merging, using new file or using old file) within automatic updater</li>
</ul>
@@ -209,7 +210,7 @@ p a {
<li>[Fix] Correct approval of posts in global announcements (Bug #12699)</li>
<li>[Sec] Do not allow setup spiders/robots to post, even if permissions are given. We see no reason why this should be possible. (Thanks to Frank Rizzo for convincing us regarding this)</li>
<li>[Sec] Do not display the last active column within the memberlist if u_viewonline permission is not given (Bug #12797)</li>
- <li>[Fix] Display custom profile field &quotdate&quot; based on users language (Bug #12787)</li>
+ <li>[Fix] Display custom profile field &quot;date&quot; based on users language (Bug #12787)</li>
<li>[Fix] Allow adding of help language files within subdirectories (Bug #12783)</li>
<li>[Fix] Correctly apply smileys on posting having # within their emotion code</li>
<li>[Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)</li>