From dec3e2f728bb5fb344c0098b6a8b909495d2d662 Mon Sep 17 00:00:00 2001 From: Josh Woody Date: Thu, 4 Feb 2010 01:06:25 +0000 Subject: Merge r10472 and r10474 into the 3.0.7 branch git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9f6b886932..43f4311600 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -153,6 +153,7 @@
  • [Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)
  • [Fix] Do not store email templates in database. (Bug #54505)
  • [Fix] Fix javascript bug in the smilies ACP. (Bug #55725)
    • +
  • [Fix] Unify BBCode Selection across browsers. (Bug #38765)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 4a17abbcc4950cef434e579c8fa68cc32bf8c284 Mon Sep 17 00:00:00 2001 From: Josh Woody Date: Thu, 4 Feb 2010 01:07:30 +0000 Subject: Merge r10473 into the 3.0.7 branch. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 43f4311600..b6b2503968 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -154,6 +154,7 @@
  • [Fix] Do not store email templates in database. (Bug #54505)
  • [Fix] Fix javascript bug in the smilies ACP. (Bug #55725)
  • [Fix] Unify BBCode Selection across browsers. (Bug #38765)
    • +
  • [Fix] Allow convertors to read in configuration from files. (Bug #57265) (patch by Dicky)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 8682f644e558fff6e82978865a75c9cc6868023a Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 8 Feb 2010 16:54:39 +0000 Subject: Merge r10484 and r10485 into 3.0.7 branch. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b6b2503968..be259b6a31 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -141,7 +141,7 @@
  • [Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)
  • [Fix] Do not duplicate previous/next links in pagination text of moderator logs and user notes in MCP for subsilver2. (Bug #55045)
  • [Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.
    • -
  • [Fix] Don't send activation email when user tries to change email without permission (fix by nrohler). (Bug #56335)
    • +
  • [Fix] Don't send activation email when user tries to change email without permission. (Bug #56335 - Fix by nrohler)
  • [Fix] Replace hard coded "px" with translated language-string. (Bug #52495)
  • [Fix] Correctly hover list menu in UCP and MCP for RTL languages. (Bug #49945)
  • [Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)
    • @@ -154,7 +154,8 @@
  • [Fix] Do not store email templates in database. (Bug #54505)
  • [Fix] Fix javascript bug in the smilies ACP. (Bug #55725)
  • [Fix] Unify BBCode Selection across browsers. (Bug #38765)
    • -
  • [Fix] Allow convertors to read in configuration from files. (Bug #57265) (patch by Dicky)
    • +
  • [Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)
    • +
  • [Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 6a9e5ea78f3bf418bf9fa617a251d11786a92e60 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 17 Feb 2010 10:03:29 +0000 Subject: Merge r10493, r10494 - #57825 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10495 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index be259b6a31..6e4b9d6de5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -156,6 +156,7 @@
  • [Fix] Unify BBCode Selection across browsers. (Bug #38765)
  • [Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)
  • [Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)
    • +
  • [Fix] Small language correction for the FAQ page. (Bug #57825)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 0ddc3703869733546e836f68761d1f42498386b4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 17 Feb 2010 18:40:22 +0000 Subject: Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6e4b9d6de5..2e2b228771 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -157,6 +157,7 @@
  • [Fix] Allow convertors to read in configuration from files. (Bug #57265 - Patch by Dicky)
  • [Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)
  • [Fix] Small language correction for the FAQ page. (Bug #57825)
    • +
  • [Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From b68d23347a03ff0f7b3fe9dbdddd93675f812776 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 18 Feb 2010 01:31:06 +0000 Subject: Merge r10488 into 3.0.7 branch. #57505 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2e2b228771..77951b77df 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -98,7 +98,7 @@
  • [Fix] Do not link to user profile in ATOM feed entry if post has been made by the guest user. (Bug #54275)
  • [Fix] Make word censoring case insensitive. (Bug #54265)
  • [Fix] Fulltext-MySQL search for keywords and username at the same time. (Bug #54325)
    • -
  • [Fix] Various XHTML and CSS mistakes in prosilver. (Bugs #54705, #55895)
    • +
  • [Fix] Various XHTML and CSS mistakes in prosilver and subsilver2. (Bugs #54705, #55895, #57505)
  • [Fix] Correctly show topic ATOM feed link when only post id is specified. (Bug #53025)
  • [Fix] Cleanly handle forum/topic not found in ATOM Feeds. (Bug #54295)
  • [Fix] PHP 5.3 compatibility: Check if function dl() exists before calling it. (Bug #54665)
    • -- cgit v1.2.1 From dccd529498a879d4620e5878acd0435274f3182b Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 18 Feb 2010 01:40:51 +0000 Subject: Merge r10497 and r10499 into 3.0.7 - #57755 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 77951b77df..7ff38d6741 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -158,6 +158,7 @@
  • [Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)
  • [Fix] Small language correction for the FAQ page. (Bug #57825)
  • [Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)
    • +
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From fff87d544d2c6c4d6174fbd11544a3701935a911 Mon Sep 17 00:00:00 2001 From: Josh Woody Date: Thu, 18 Feb 2010 04:56:06 +0000 Subject: #57715 - Correct behavior of "force_approved_state" when value is false. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7ff38d6741..f3f14289cb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -158,7 +158,8 @@
  • [Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)
  • [Fix] Small language correction for the FAQ page. (Bug #57825)
  • [Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)
    • -
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
    • +
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
    • +
  • [Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From a63ceb28e22873921e70326e758d18c0569d3eb0 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sat, 20 Feb 2010 00:15:35 +0000 Subject: merge in r10509 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f3f14289cb..7204f15110 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -160,6 +160,7 @@
  • [Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
  • [Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)
    • +
  • [Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 9aa4a822efac6763c0de22d5d62fe7e6b3c9c31a Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 21 Feb 2010 11:35:45 +0000 Subject: Enter stage left: the INTTEXT token (merge) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7204f15110..218ed0b90e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -179,7 +179,10 @@
  • [Change] Tweak Q&A CAPTCHA garbage collection.
  • [Change] Show a proper preview for the Q&A CAPTCHA. (Bug #56365)
  • [Change] Speed up topic move operation by adding an index for topic_id on the topics track table. (Bug #56545)
    • +
  • [Change] Warn users about potentially dangerous BBcodes.
  • [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter "auth=http".
    • +
  • [Feature] Add INTTEXT token type to custom bbcodes to allow non-ASCII letters in html attributes.
    • +

    1.ii. Changes since 3.0.5

    -- cgit v1.2.1 From 87bc1c67609abb39a3d17521da0540ed1c2d8173 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 22 Feb 2010 00:59:27 +0000 Subject: sneak attack merge r10518 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 218ed0b90e..5d517051d0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -161,6 +161,7 @@
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
  • [Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)
  • [Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)
    • +
  • [Fix] Ensure a database connection is available before logging general errors. (Bug #57975)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 63e07777cd9a5d7ef68693fa7c9098e46493965c Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 23 Feb 2010 16:12:51 +0000 Subject: Merge r10515 into 3.0.7 branch git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5d517051d0..6df74acc9e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -161,6 +161,7 @@
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
  • [Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)
  • [Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)
    • +
  • [Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)
  • [Fix] Ensure a database connection is available before logging general errors. (Bug #57975)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
    • -- cgit v1.2.1 From d3459b3f493ddd06b51f345897dc99368a328326 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 23 Feb 2010 19:07:25 +0000 Subject: Merge r10526 into 3.0.7 branch. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6df74acc9e..aef5d601d0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -163,6 +163,7 @@
  • [Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)
  • [Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)
  • [Fix] Ensure a database connection is available before logging general errors. (Bug #57975)
    • +
  • [Fix] Do not delete unrelated attachments when deleting empty forums. (Bug #57375)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1 From 3a48b03547ca5704cc422a6ebe24ecb4b8b17797 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 23 Feb 2010 23:46:43 +0000 Subject: Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index aef5d601d0..494d325e2b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -185,6 +185,7 @@
  • [Change] Warn users about potentially dangerous BBcodes.
  • [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter "auth=http".
  • [Feature] Add INTTEXT token type to custom bbcodes to allow non-ASCII letters in html attributes.
    • +
  • [Feature] Add ability to enable quick reply in all forums.
    • -- cgit v1.2.1 From 82219d51c2cbd76bedf43836f5b2e1533780bba5 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 24 Feb 2010 00:08:13 +0000 Subject: Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 494d325e2b..335628cac6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -164,6 +164,7 @@
  • [Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)
  • [Fix] Ensure a database connection is available before logging general errors. (Bug #57975)
  • [Fix] Do not delete unrelated attachments when deleting empty forums. (Bug #57375)
    • +
  • [Fix] Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop (Bug #54075)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • -- cgit v1.2.1