phpBB Master

• 

  Marc 07 Jan 2018 6b221ae4cb4b4c48efcd62a477246a3bc08af9c7

  Merge branch '3.2.x'
• 

  Marc 07 Jan 2018 f26cf2dc1f2c58ac6cf97974aafa749688cacbaa m

  [3.2.x] Update versions to 3.2.3-dev

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

  Marc 07 Jan 2018 d2226b36648e951313bb3627c9690e2dc5563e71 m

  Merge branch '3.1.x' into 3.2.x
• 

  Marc 07 Jan 2018 7e2136587a4d5f2f011189aca6f94ee6a780eaf1 m

  Merge branch 'prep-release-3.2.2' into 3.2.x
• 

  Marc 07 Jan 2018 77b275181aeddf43e1077d06abce11a9722bb85a m

  [prep-release-3.2.2] Add 3.1.12 to build and fix display of download box

  • build/build.xml (version 77b275181aeddf43e1077d06abce11a9722bb85a)
  • phpBB/phpbb/install/module/update_filesystem/task/diff_files.php (version 77b275181aeddf43e1077d06abce11a9722bb85a)
  • phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php (version 77b275181aeddf43e1077d06abce11a9722bb85a)
• 

  Marc 07 Jan 2018 dc8ff9da28b8ab4ad11c7ea94cca526f17c87fe5 m

  Merge branch 'prep-release-3.1.12' into 3.1.x
• 

  Marc 07 Jan 2018 e4fc82bee55c72d545515b4ef89ecf66c4a7c837 m

  Merge branch 'prep-release-3.1.12' into prep-release-3.2.2
• 

  Marc 07 Jan 2018 f38fce5ce570318ac64c95601e891cfe2e8f4d1a m

  [prep-release-3.1.12] Update changelog

  • phpBB/docs/CHANGELOG.html (version f38fce5ce570318ac64c95601e891cfe2e8f4d1a)
• 

  Marc 07 Jan 2018 f8180ca97bf6d9e92a0a080e2af8af2f0654bfbe m

  [prep-release-3.2.2] Add migration for 3.2.2

  • phpBB/phpbb/db/migration/data/v32x/v322.php (version f8180ca97bf6d9e92a0a080e2af8af2f0654bfbe)
• 

  Marc 07 Jan 2018 e7c5fc32d2aedbc89a5e54362af83d538600ba87 m

  [prep-release-3.2.2] Update changelog for 3.2.2 release

  • phpBB/docs/CHANGELOG.html (version e7c5fc32d2aedbc89a5e54362af83d538600ba87)
• 

  Marc 07 Jan 2018 4aab9e792ae05640611e1d613f4cd478c7f5439d m

  Merge pull request #5077 from marc1706/ticket/15353
  [ticket/15353] Do not use empty to not offer empty archive for download
• 

  Marc 07 Jan 2018 f26b2c00de5702403e3c5983dedf99ac6dc06d8c m

  Merge pull request #5076 from marc1706/ticket/15496
  [ticket/15496] Add sort key to SELECT in fulltext_postgres
• 

  Marc 07 Jan 2018 2a6c9233e9667143f8d105b54c5cdb41b5a9e686 m

  Merge pull request #5075 from marc1706/ticket/15497
  [ticket/15497] Backport fix for create_insert_array() declaration in admin_activate_user
• 

  Marc 07 Jan 2018 69a168bcb2931f6071ac4479fd62f71da2119586 m

  Merge pull request #5074 from marc1706/ticket/15498
  [ticket/15498] Do not pass whether URL uses router to is_route
• 

  Marc 07 Jan 2018 c7b3407eb2f9946a561eb0a4d4b0a20387bd6c33 m

  Merge pull request #5068 from Derky/ticket/15489
  [ticket/15489] Remove NO_FORUMS message for categories with subforums
• 

  Marc 07 Jan 2018 1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99 m

  Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2
• 

  Marc 07 Jan 2018 3ae016954212e90032a10d1427c34a4ff9d9637c m

  Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2
• 

  Marc 07 Jan 2018 2a939fa779059b2eedc5eaf33706b4a1627ed30e m

  Merge pull request #41 from phpbb/ticket/security/211-rhea
  [ticket/security/211] Rhea version of security fix
• 

  Marc 06 Jan 2018 57179fbb7944e75a92e15cdbd5a9955bcc1677c7 m

  [ticket/15353] Do not use empty to not offer empty archive for download
  PHPBB3-15353

  • phpBB/phpbb/install/module/update_filesystem/task/diff_files.php (version 57179fbb7944e75a92e15cdbd5a9955bcc1677c7)
  • phpBB/phpbb/install/module/update_filesystem/task/download_updated_files.php (version 57179fbb7944e75a92e15cdbd5a9955bcc1677c7)
• 

  Marc 06 Jan 2018 d05c7fd34288375683c5b0467930748b1457ac75 m

  [ticket/15496] Add sort key to SELECT in fulltext_postgres
  Postgres requires that the column being ordered also appears in the
  SELECT part of the query.
  
  PHPBB3-15496

  • phpBB/phpbb/search/fulltext_postgres.php (version d05c7fd34288375683c5b0467930748b1457ac75)
• 

  rxu 06 Jan 2018 101e6c8f96e29d96c4b66c6257f809366dbfe351 m

  [ticket/14972] Fix create_insert_array() declaration in admin_activate_user
  PHPBB3-14972

  • phpBB/phpbb/notification/type/admin_activate_user.php (version 101e6c8f96e29d96c4b66c6257f809366dbfe351)
• 

  Marc 06 Jan 2018 e31474542dac500c76ed67d2b80f90a38da149d1 m

  [ticket/15498] Do not pass whether URL uses router to is_route
  is_route expects a flag of whether this is a route that was generated
  with the router as opposed to is_router_used() which returns whether
  the router will be used via app.php.
  
  PHPBB3-15498

  • phpBB/includes/functions.php (version e31474542dac500c76ed67d2b80f90a38da149d1)
• 

  Derky <derky@phpbb.com> 04 Jan 2018 2119dee53d6409cbe77ec944fd322e3f8df0dcae m

  [ticket/15489] Add NO_FORUMS_IN_CATEGORY message
  PHPBB3-15489

  • phpBB/language/en/viewforum.php (version 2119dee53d6409cbe77ec944fd322e3f8df0dcae)
  • phpBB/styles/prosilver/template/viewforum_body.html (version 2119dee53d6409cbe77ec944fd322e3f8df0dcae)
• 

  Marc 01 Jan 2018 bf5f11e11ac0f25441ba891fc16d5a780e4450e2 m

  Merge branch 'ticket/security/211' into ticket/security/211-rhea
• 

  Marc 31 Dec 2017 b2dacefbe7123cf8e4e854b2f4de959d82ab1ee2 m

  Merge branch 'prep-release-3.1.12' into 3.1.x
• 

  Marc 31 Dec 2017 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb m

  [prep-release-3.1.12] Update changelog for 3.1.12

  • phpBB/docs/CHANGELOG.html (version 0c3f7c6c8e352a73dacc1ff21a2b39a556ea6deb)
• 

  Marc 31 Dec 2017 5def7e255ec46175b74a31523f89309136e78869 m

  [prep-release-3.1.12] Add migration for 3.1.12

  • phpBB/phpbb/db/migration/data/v31x/v3112.php (version 5def7e255ec46175b74a31523f89309136e78869)
• 

  Marc 31 Dec 2017 7dfd57077a31d67dc18af9802f826da6b015d8fe m

  Merge pull request #40 from phpbb/ticket/security/211
  [ticket/security/211] Make sure website URL only uses http & https schemes
• 

  Marc 31 Dec 2017 92350db572f3814630f5bb6e609d503ffd2c4bd5 m

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

  • build/build.xml (version 92350db572f3814630f5bb6e609d503ffd2c4bd5)
  • phpBB/includes/constants.php (version 92350db572f3814630f5bb6e609d503ffd2c4bd5)
  • phpBB/install/schemas/schema_data.sql (version 92350db572f3814630f5bb6e609d503ffd2c4bd5)
• 

  Marc 31 Dec 2017 a2daf30415b7e67439f3d41bd843a133b400b03f m

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

  • phpBB/install/convertors/convert_phpbb20.php (version a2daf30415b7e67439f3d41bd843a133b400b03f)
  • phpBB/styles/prosilver/style.cfg (version a2daf30415b7e67439f3d41bd843a133b400b03f)
  • phpBB/styles/subsilver2/style.cfg (version a2daf30415b7e67439f3d41bd843a133b400b03f)
• 

  abyssmedia <30393121+abyssmedia@users.noreply.github.com> 31 Dec 2017 949f07e8ba81f6d711b7f7fa6024a19da71dc249 m

  [ticket/15303] Correctly refer to $memcached and not $memcache
  PHPBB3-15303

  • phpBB/phpbb/cache/driver/memcached.php (version 949f07e8ba81f6d711b7f7fa6024a19da71dc249)
• 

  Derky <derky@phpbb.com> 31 Dec 2017 4fe09b98b0157309fc7e3da9109e30970575249a m

  [ticket/15489] Remove NO_FORUMS message for categories with subforums
  PHPBB3-15489

  • phpBB/styles/prosilver/template/viewforum_body.html (version 4fe09b98b0157309fc7e3da9109e30970575249a)
• 

  Marc 03 Aug 2017 342a7cbd55829283663ad6ba29f924eeb53fca38 m

  [ticket/security/211] Allow make_clickable() again after change to regex
  SECURITY-211

  • phpBB/phpbb/profilefields/type/type_string_common.php (version 342a7cbd55829283663ad6ba29f924eeb53fca38)
  • phpBB/phpbb/profilefields/type/type_url.php (version 342a7cbd55829283663ad6ba29f924eeb53fca38)
  • tests/profilefields/type_string_test.php (version 342a7cbd55829283663ad6ba29f924eeb53fca38)
• 

  Marc 27 Jul 2017 f7d387f93c421e93ef13375bd5e0fb408e921598 m

  [ticket/security/211] Add test for line breaks in URL
  SECURITY-211

  • tests/functions/make_clickable_test.php (version f7d387f93c421e93ef13375bd5e0fb408e921598)
• 

  Marc 26 Jul 2017 0aba1faa0803af6013c9ac2071e87f117e9c4835 m

  [ticket/security/211] Do not match javascript URIs with URL regexes
  SECURITY-211

  • phpBB/develop/regex_idn.php (version 0aba1faa0803af6013c9ac2071e87f117e9c4835)
  • phpBB/includes/functions.php (version 0aba1faa0803af6013c9ac2071e87f117e9c4835)
  • tests/functions/make_clickable_test.php (version 0aba1faa0803af6013c9ac2071e87f117e9c4835)
• 

  Marc 23 Jul 2017 91f9050a70d95a472daf9f6fa15187c195f05909 m

  [ticket/security/211] Extend tests for profile field values
  SECURITY-211

  • tests/profilefields/type_string_test.php (version 91f9050a70d95a472daf9f6fa15187c195f05909)
  • tests/profilefields/type_url_test.php (version 91f9050a70d95a472daf9f6fa15187c195f05909)
• 

  Marc 23 Jul 2017 2749bfe26ccae7db4174cdd83453d79366113c28 m

  [ticket/security/211] Only run make_clickable() on URL type profile fields
  SECURITY-211

  • phpBB/phpbb/profilefields/type/type_string_common.php (version 2749bfe26ccae7db4174cdd83453d79366113c28)
  • phpBB/phpbb/profilefields/type/type_url.php (version 2749bfe26ccae7db4174cdd83453d79366113c28)
• 

  Marc 22 Jul 2017 882a3c383103802c491404032c5d267e4f5271a0 m

  [ticket/security/211] Make sure website URL only uses http & https schemes
  SECURITY-211

  • phpBB/includes/functions.php (version 882a3c383103802c491404032c5d267e4f5271a0)
  • phpBB/includes/functions_convert.php (version 882a3c383103802c491404032c5d267e4f5271a0)
  • phpBB/phpbb/profilefields/type/type_url.php (version 882a3c383103802c491404032c5d267e4f5271a0)
  • tests/profilefields/type_url_test.php (version 882a3c383103802c491404032c5d267e4f5271a0)