From dbae1db24c9bc264945d841b76642c5d14a35a63 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 11 Apr 2008 14:21:45 +0000 Subject: merge some changes/fixes henry: is your viewonline fix/change missing? ;) git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'phpBB/docs') diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 220a7ad5ed..c8caeba819 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
  1. Changelog
      +
    1. Changes since 3.0.1
    2. Changes since 3.0.0
    3. Changes since RC-8
    4. Changes since RC-7
    5. @@ -81,11 +82,17 @@
      -

      1.i. Changes since 3.0.0

      +

      1.i. Changes since 3.0.1

        -
      • [Change] Migrate phpBB to PHP versions >= 5.1
      • +
      • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
      • +
      • [Fix] Fixed blank style on setups having no username defined within config.php (Bug #25065)
      • +
      + +

      1.ii. Changes since 3.0.0

      +
        +
      • [Change] Migrate phpBB to PHP versions >= 5.1
      • [Change] Validate birthdays (Bug #15004)
      • [Fix] Allow correct avatar caching for CGI installations. (thanks wildbill)
      • [Fix] Fix disabling of word censor, now possible again
      • @@ -148,9 +155,13 @@
      • [Sec] Check for non-empty config.php within style.php (Report #s24575) - reported by bantu
      +<<<<<<< .working

      1.i. Changes since 3.0.RC8

      +======= +

      1.iii. Changes since 3.0.RC8

      +>>>>>>> .merge-right.r8502
      • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
      • @@ -159,7 +170,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.ii. Changes since 3.0.RC7

      +

      1.iv. Changes since 3.0.RC7

      • [Fix] Fixed MSSQL related bug in the update system
      • @@ -194,7 +205,7 @@
      • [Fix] No duplication of active topics (Bug #15474)
      -

      1.iii. Changes since 3.0.RC6

      +

      1.v. Changes since 3.0.RC6

      • [Fix] Submitting language changes using acp_language (Bug #14736)
      • @@ -204,7 +215,7 @@
      • [Fix] Able to request new password (Bug #14743)
      -

      1.iv. Changes since 3.0.RC5

      +

      1.vi. Changes since 3.0.RC5

      • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
      • @@ -267,7 +278,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.v. Changes since 3.0.RC4

      +

      1.vii. Changes since 3.0.RC4

      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
      • @@ -318,7 +329,7 @@
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      -

      1.vi. Changes since 3.0.RC3

      +

      1.viii. Changes since 3.0.RC3

      • [Fix] Fixing some subsilver2 and prosilver style issues
      • @@ -427,7 +438,7 @@
      -

      1.vii. Changes since 3.0.RC2

      +

      1.ix. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
      • @@ -473,7 +484,7 @@
      -

      1.viii. Changes since 3.0.RC1

      +

      1.x. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
      • -- cgit v1.2.1