Build: #1068 was successful Changes by Marc

Code commits

phpBB Master

  • Marc

    Marc 8cba88ef0d199cfc1270c1b72337991f3964e793

    Merge branch '3.3.x'

  • Marc

    Marc 1f972f0ee742679bbc355f9b4371d071e07d0a76 m

    Merge branch 'prep-release-3.3.6' into 3.3.x

  • Marc

    Marc 2e37b2dc2d34f53f528448893fd3d02604a65760 m

    [prep-release-3.3.6] Update changelog for 3.3.6

    • phpBB/docs/CHANGELOG.html (version 2e37b2dc2d34f53f528448893fd3d02604a65760)
  • Marc

    Marc 8d6a9245c1083b54d28d712ad78fdafeb05774c1 m

    [prep-release-3.3.6] Add migration for 3.3.6

    • phpBB/phpbb/db/migration/data/v33x/v336.php (version 8d6a9245c1083b54d28d712ad78fdafeb05774c1)
  • Marc

    Marc 1a8950d01b5a23909e63ec674dea47903f078c7f m

    [prep-release-3.3.6] Update version numbers to 3.3.6

    • build/build.xml (version 1a8950d01b5a23909e63ec674dea47903f078c7f)
    • phpBB/includes/constants.php (version 1a8950d01b5a23909e63ec674dea47903f078c7f)
    • phpBB/install/phpbbcli.php (version 1a8950d01b5a23909e63ec674dea47903f078c7f)
    • phpBB/install/schemas/schema_data.sql (version 1a8950d01b5a23909e63ec674dea47903f078c7f)
  • Marc

    Marc b4fa01e9437b712dbe893ab2c72897e78244a077 m

    [prep-release-3.3.6] Update stylesheet hashes

    • phpBB/styles/prosilver/theme/stylesheet.css (version b4fa01e9437b712dbe893ab2c72897e78244a077)
  • Marc

    Marc cd057c126a5ffb5f0e1cf63dff9297dbef710131 m

    Merge pull request #66 from phpbb/ticket/security-273
    [ticket/security-273] Reset reset token info when re-activating account

  • Marc

    Marc 377ebacf0db809ff14f7cae15263ec282f4cb023 m

    Merge pull request #65 from phpbb/ticket/security-272
    [ticket/security-272] Use longer random string for activation key

  • Marc

    Marc fb2d1c2a285bff0034d0a14b54d53e23579688e9 m

    Merge pull request #6368 from marc1706/ticket/15028
    [ticket/15028] Rename automatic to advanced update

  • Marc

    Marc da2364b2c1cb755bc60eb084eb6841169cc4421d m

    [ticket/15028] Replace remaining mentions of automatic update with advanced
    PHPBB3-15028

    • phpBB/docs/INSTALL.html (version da2364b2c1cb755bc60eb084eb6841169cc4421d)
    • phpBB/language/en/install.php (version da2364b2c1cb755bc60eb084eb6841169cc4421d)
  • Marc

    Marc 4044900c699c70436214ec8b18306e42b3e6cce5 m

    [ticket/15028] Rephrase "recommendation" of who should use advanced update
    PHPBB3-15028

    • phpBB/docs/INSTALL.html (version 4044900c699c70436214ec8b18306e42b3e6cce5)
  • Marc

    Marc e78664d68b4044627af42ddade5247879f4cfa49 m

    [ticket/15028] Rename automatic to advanced update
    Also made it clear that it's only for expert users.

    PHPBB3-15028

    • phpBB/docs/INSTALL.html (version e78664d68b4044627af42ddade5247879f4cfa49)
    • phpBB/docs/README.html (version e78664d68b4044627af42ddade5247879f4cfa49)
    • phpBB/language/en/install.php (version e78664d68b4044627af42ddade5247879f4cfa49)
  • Marc

    Marc 4e5b9b23de15fe6a5d0c7f9c26174e0606e57271 m

    [ticket/security-273] Reset reset token info when re-activating account
    SECURITY-273

    • phpBB/includes/ucp/ucp_activate.php (version 4e5b9b23de15fe6a5d0c7f9c26174e0606e57271)
  • Marc

    Marc 9bc98278fef13e3b53dd2beeb8f349230fcb9943 m

    [ticket/security-272] Use strtolower for actkey
    SECURITY-272

    • phpBB/includes/ucp/ucp_register.php (version 9bc98278fef13e3b53dd2beeb8f349230fcb9943)
  • Marc

    Marc 33a789e030ff0a8b1681ddb9d6ea93bf9f8275c8 m

    [ticket/security-272] Use longer random string for activation key
    SECURITY-272

    • phpBB/includes/ucp/ucp_register.php (version 33a789e030ff0a8b1681ddb9d6ea93bf9f8275c8)