Build #1,199

Plan branch:

Build: #1199 was successful Changes by Marc

Stages & jobs

  1. Default Stage

Code commits

phpBB Master

  • Marc

    Marc 88385d6da2169c2b1d3162c024af71aeb408ffec

    Merge branch '3.3.x'

  • Marc

    Marc 7e6c5df710bab1aeff3d70c1b3f47f415695e2c7 m

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

  • Marc

    Marc 90973a52b46cf606fdea893e1545bc6b0899a5f7 m

    [prep-release-3.3.11] Update changelog for 3.3.11

    • phpBB/docs/CHANGELOG.html (version 90973a52b46cf606fdea893e1545bc6b0899a5f7)
  • Marc

    Marc 4eef6a4de47ad07c8d829e4ad9ce5b444b2ddefc m

    [3.3.x] Update version numbers to 3.3.12-dev

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

    Marc 01b8d6a58ee8f33a33c93b65293823476279229e m

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

  • Marc

    Marc 31b3d56ac1877504a67f46518698ee4fc7cab2fa m

    Merge pull request #70 from phpbb/ticket/security-132
    [ticket/security-132] Limit maximum number of captcha attempts at register

  • Marc

    Marc ccf6e6c255d38692d72fcb613b113e6eaa240aac m

    Merge pull request #69 from phpbb/ticket/security-279
    [ticket/security/279] Escape smilies URL and prevent paths in .pak filename

  • Marc

    Marc 8fe3a97a1a77b9e8adabc12cfe411830cca761d0 m

    [prep-release-3.3.11] Update changelog for 3.3.11

    • phpBB/docs/CHANGELOG.html (version 8fe3a97a1a77b9e8adabc12cfe411830cca761d0)
  • Marc

    Marc 2c5519da39f13a14f5643d0fc823ab1a0edf1064 m

    [prep-release-3.3.11] Add migration for 3.3.11

    • phpBB/phpbb/db/migration/data/v33x/v3311.php (version 2c5519da39f13a14f5643d0fc823ab1a0edf1064)
  • Marc

    Marc 0c90bf000084ad118b4df6be913fe706d6a15265 m

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

    • phpBB/install/convertors/convert_phpbb20.php (version 0c90bf000084ad118b4df6be913fe706d6a15265)
    • phpBB/styles/prosilver/style.cfg (version 0c90bf000084ad118b4df6be913fe706d6a15265)
  • Marc

    Marc edc610e81d359e3e25ec0f57f69377f5ba53adde m

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

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

    Marc 137422116e528534cb91e94b2512e2cbe6627ae0 m

    [ticket/security-132] Limit maximum number of captcha attempts at register
    SECURITY-132

    • phpBB/includes/ucp/ucp_register.php (version 137422116e528534cb91e94b2512e2cbe6627ae0)
  • Derky <derky@phpbb.com>

    Derky <derky@phpbb.com> c4f42c1573a1c28de8e34cbe6abf587bcbe050c6 m

    [ticket/security/279] Use rawurlencode for escaping smilie URLs
    SECURITY-279

    • phpBB/includes/acp/acp_icons.php (version c4f42c1573a1c28de8e34cbe6abf587bcbe050c6)
  • Derky <derky@phpbb.com>

    Derky <derky@phpbb.com> 266376af2e0cc52868fc345554440b81460da114 m

    [ticket/security/279] Use utf8_basename for smilies pak file check
    SECURITY-279

    • phpBB/includes/acp/acp_icons.php (version 266376af2e0cc52868fc345554440b81460da114)
  • Derky <derky@phpbb.com>

    Derky <derky@phpbb.com> d8ac6f575ef719e89509d5e26fab608e6b0dfce0 m

    [ticket/security/279] Escape smilies URL and prevent paths in .pak filename
    SECURITY-279

    • phpBB/includes/acp/acp_icons.php (version d8ac6f575ef719e89509d5e26fab608e6b0dfce0)