Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: 3.1.x
Commits on May 30, 2015
  1. @naderman

    Merge pull request #3560 from Nicofuma/ticket/13790

    naderman authored
    [ticket/13790] Update phpcs
Commits on May 28, 2015
  1. @naderman

    [ticket/13874] Add master to sami API docs

    naderman authored
    PHPBB3-13874
Commits on Feb 25, 2015
  1. @naderman
  2. @naderman
  3. @naderman

    Merge branch 'ticket/13617' into ticket/13617-ascraeus

    naderman authored
    * ticket/13617:
      [ticket/13617] Enforce column size limit for session_forum_id
    
    Conflicts:
    	phpBB/phpbb/session.php
  4. @naderman
Commits on Jan 26, 2015
  1. @naderman

    Merge branch 'develop-olympus' into develop-ascraeus

    naderman authored
    * develop-olympus:
      [prep-release-3.0.13] Bump version numbers for 3.0.13 release
      [prep-release-3.0.13] Highlight security relevant changes
    
    Conflicts:
    	build/build.xml
    	phpBB/install/database_update.php
  2. @naderman

    Merge branch 'prep-release-3.0.13' into develop-olympus

    naderman authored
    * prep-release-3.0.13:
      [prep-release-3.0.13] Bump version numbers for 3.0.13 release
      [prep-release-3.0.13] Highlight security relevant changes
    
    Conflicts:
    	build/build.xml
    	phpBB/includes/constants.php
    	phpBB/install/database_update.php
    	phpBB/install/schemas/schema_data.sql
  3. @naderman
  4. @naderman
Commits on Jan 22, 2015
  1. @naderman

    Merge pull request #3173 from Nicofuma/ticket/13361

    naderman authored
    [ticket/13361] Improve the exception listener
Commits on Jan 21, 2015
  1. @naderman

    Merge branch 'develop-olympus' into develop-ascraeus

    naderman authored
    * develop-olympus:
      [ticket/13531] Send 404 Not Found.
      [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
  2. @naderman

    Merge pull request #3316 from bantu/ticket/13531

    naderman authored
    [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
Commits on Jan 19, 2015
  1. @naderman

    Merge branch 'develop-olympus' into develop-ascraeus

    naderman authored
    * develop-olympus:
      [ticket/10985] Add fix to properly inherit style during update process
    
    Conflicts:
    	phpBB/includes/bbcode.php
  2. @naderman

    Merge pull request #2990 from Senky/ticket/10985

    naderman authored
    [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
Commits on Nov 25, 2014
  1. @naderman

    [ticket/13376] Revert unnecessary change for cookies called GLOBALS 9…

    naderman authored
    …2f554e
    
    Also introduce a clear cookie message hardcoded just in case.
    
    PHPBB3-13376
Commits on Nov 16, 2014
  1. @naderman

    Merge remote-tracking branch 'github-nicofuma/ticket/13280' into deve…

    naderman authored
    …lop-ascraeus
    
    * github-nicofuma/ticket/13280:
      [ticket/13280] Output escaping for the symfony request object
      [ticket/13280] Add new tests
      [ticket/13280] Make the tests failing
      [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
Commits on Nov 2, 2014
  1. @naderman

    Merge branch 'prep-release-3.1.1' into develop-ascraeus

    naderman authored
    * prep-release-3.1.1:
      [ticket/13271] Disable CC sender feature for anonymous users
      [prep-release-3.1.1] Add 3.1.1 CHANGELOG
      [prep-release-3.1.1] Add 3.1.1 migration file
      [ticket/13263] Make sure default style exists and clean up code
      [ticket/13263] Only install/set prosilver if no style available
      [ticket/13263] Use prosilver as default style if user's style doesn't exist
      [ticket/security-164] Correctly format page_name
      [ticket/security-164] Sanitize all global variables in symfony_request class
      [ticket/13248] Use functional framework login method in tests
      [ticket/13248] Correctly pass provider name
      [ticket/13248] Always use provider collection for getting provider
      [ticket/13248] Allow specifying different auth provider in provider collection
      [ticket/13248] Use auth provider collection for getting provider
      [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
      [ticket/13267] Update Automatic Update instructions to include vendor directory
      [ticket/13268] Properly append ternary result in get_existing_indexes()
      [prep-release-3.1.1] Update version number to 3.1.1
    
    Conflicts:
    	build/build.xml
    	phpBB/includes/constants.php
    	phpBB/install/schemas/schema_data.sql
Commits on Nov 1, 2014
  1. @naderman

    Merge remote-tracking branch 'github-security/ticket/security-164-alt…

    naderman authored
    …' into prep-release-3.1.1
    
    * github-security/ticket/security-164-alt:
      [ticket/security-164] Correctly format page_name
      [ticket/security-164] Sanitize all global variables in symfony_request class
  2. @naderman

    Merge branch 'ticket/13271' into prep-release-3.1.1

    naderman authored
    * ticket/13271:
      [ticket/13271] Disable CC sender feature for anonymous users
  3. @naderman
  4. @naderman
  5. @naderman
  6. @naderman

    Merge remote-tracking branch 'github-marc1706/ticket/13263' into prep…

    naderman authored
    …-release-3.1.1
    
    * github-marc1706/ticket/13263:
      [ticket/13263] Make sure default style exists and clean up code
      [ticket/13263] Only install/set prosilver if no style available
      [ticket/13263] Use prosilver as default style if user's style doesn't exist
  7. @naderman

    Merge pull request #3104 from marc1706/ticket/13248-alt

    naderman authored
    [ticket/13248] Login functions need to use provider collection for retrieving provider
  8. @naderman

    Merge branch 'ticket/13262' into prep-release-3.1.1

    naderman authored
    * ticket/13262:
      [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
  9. @naderman

    Merge branch 'ticket/13267' into prep-release-3.1.1

    naderman authored
    * ticket/13267:
      [ticket/13267] Update Automatic Update instructions to include vendor directory
  10. @naderman

    Merge branch 'ticket/13268' into prep-release-3.1.1

    naderman authored
    * ticket/13268:
      [ticket/13268] Properly append ternary result in get_existing_indexes()
  11. @naderman
Commits on Oct 28, 2014
  1. @naderman
  2. @naderman

    [ticket/13234-2] Never allow autologin/remember me to modify the userid

    naderman authored
    Ascraeus version of 64d97d0 commit
    
    PHPBB3-13234
  3. @naderman

    Merge branch 'ticket/13234' into ticket/13234-2

    naderman authored
    * ticket/13234:
      [ticket/13234] Never allow autologin/remember me to modify the userid
  4. @naderman

    [ticket/13234] Never allow autologin/remember me to modify the userid

    naderman authored
    This prevents admin relogin with forced user id from overwriting
    remember me cookies
    
    PHPBB3-13234
  5. @naderman

    Merge branch 'prep-release-3.1.0' into develop-ascraeus

    naderman authored
    * prep-release-3.1.0:
      [ticket/13227] Properly handle curlwrapper headers in remote avatars
      [ticket/13231] Update the dependencies of the migration contact_admin_form
  6. @naderman

    [ticket/13232] Ensure prune cron job always gets run in prune test

    naderman authored
    The cron scheduler might pick a different task but we don't want to go
    through them all to find the one we need. So we just make sure cron is
    run at all and then manually run the one we want.
    
    PHPBB3-13232
Something went wrong with that request. Please try again.