Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'prep-release-3.2.1' into 3.2.x | Marc Alexander | 2017-07-16 | 23 | -51/+461 |
|\ | |||||
| * | [prep-release-3.2.1] Add missing .htaccess file | Marc Alexander | 2017-07-16 | 1 | -0/+33 |
| | | |||||
| * | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-07-16 | 3 | -0/+64 |
| |\ | |||||
| | * | [prep-release-3.1.11] Add migration for 3.1.11 | Marc Alexander | 2017-07-16 | 1 | -0/+36 |
| | | | |||||
| | * | [prep-release-3.1.11] Update version numbers to 3.1.11 | Marc Alexander | 2017-07-16 | 2 | -2/+2 |
| | | | |||||
| | * | Merge pull request #38 from phpbb/ticket/security/210 | Marc Alexander | 2017-07-16 | 2 | -2/+15 |
| | |\ | | | | | | | | | | | | | [ticket/security/210] Prevent using IP addresses or ports for remote avatar | ||||
| | * \ | Merge pull request #32 from phpbb/ticket/security-203 | Marc Alexander | 2017-07-16 | 3 | -5/+121 |
| | |\ \ | | | | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper | ||||
| | * \ \ | Merge pull request #29 from phpbb/ticket/security-181 | Marc Alexander | 2017-07-16 | 8 | -5/+130 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | [ticket/security-181] Harden protection of migrations files and other directories | ||||
| | * \ \ \ | Merge pull request #37 from phpbb/ticket/security/208 | Marc Alexander | 2017-07-16 | 1 | -0/+7 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/security/208] Add form key to password reset form | ||||
| | | * | | | | [ticket/security/208] Add form key to password reset form | Marc Alexander | 2017-06-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-208 | ||||
| | * | | | | | Merge pull request #36 from phpbb/ticket/security/124 | Marc Alexander | 2017-07-16 | 1 | -0/+21 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security/124] Filter out disallowed search query items | ||||
| | | * | | | | | [ticket/security/124] Filter out disallowed search query items | Marc Alexander | 2017-06-18 | 1 | -0/+21 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | SECURITY-124 | ||||
| * | | | | | | Merge pull request #4864 from lavigor/ticket/15259 | Marc Alexander | 2017-07-16 | 1 | -22/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15259] Fatal error on SQLite/Oracle database update | ||||
| | * | | | | | | [ticket/15259] Fatal error on SQLite/Oracle database update | lavigor | 2017-07-01 | 1 | -22/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15259 | ||||
| * | | | | | | | Merge pull request #4865 from JoshyPHP/ticket/15261 | Marc Alexander | 2017-07-16 | 3 | -15/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15261] Fix censoring HTML tags | ||||
| | * | | | | | | | [ticket/15261] Fix censoring HTML tags | JoshyPHP | 2017-07-03 | 3 | -15/+11 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15261 | ||||
| * | | | | | | | [prep-release-3.2.1] Add migration for 3.2.1 | Marc Alexander | 2017-07-16 | 1 | -0/+37 |
| | | | | | | | | |||||
| * | | | | | | | [prep-release-3.2.1] Update versions for 3.2.1 | Marc Alexander | 2017-07-16 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #39 from phpbb/ticket/security/210-rhea | Marc Alexander | 2017-07-16 | 2 | -2/+15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security/210] Prevent using IP addresses or ports for remote avatar -- Rhea | ||||
| | * \ \ \ \ \ \ | Merge branch 'ticket/security/210' into ticket/security/210-rhea | Marc Alexander | 2017-07-10 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | [ticket/security/210] Adjust regex and add tests for IPv6 | Marc Alexander | 2017-07-10 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-210 | ||||
| | * | | | | | | | Merge branch 'ticket/security/210' into ticket/security/210-rhea | Marc Alexander | 2017-07-09 | 2 | -2/+15 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | [ticket/security/210] Prevent using IP addresses or ports for remote avatar | Marc Alexander | 2017-07-09 | 2 | -2/+15 |
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | SECURITY-210 | ||||
| * | | | | | | Merge pull request #35 from phpbb/ticket/security-203-rhea | Marc Alexander | 2017-07-16 | 3 | -8/+125 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper -- Rhea | ||||
| | * \ \ \ \ \ | Merge branch 'ticket/security-203' into ticket/security-203-rhea | Marc Alexander | 2016-12-28 | 3 | -9/+126 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | [ticket/security-203] Allow more characters for branch names | Marc Alexander | 2016-12-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-203 | ||||
| | | * | | | | | [ticket/security-203] Do not add null values to versions info | Marc Alexander | 2016-12-27 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also stopped using reference for validate_versions() method argument. SECURTIY-203 | ||||
| | | * | | | | | [ticket/security-203] Fully validate version check data in version helper | Marc Alexander | 2016-12-26 | 3 | -5/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will also take care of SECURITY-204 as it's the same underlying issue. Admins still need to ensure they don't visit malicious sites for URLs provided by extensions. SECURITY-203 | ||||
| * | | | | | | | Merge pull request #30 from phpbb/ticket/security-181-rhea | Marc Alexander | 2017-07-16 | 9 | -4/+162 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security-181] Harden protection of migrations files and other directories | ||||
| | * \ \ \ \ \ \ | Merge branch 'ticket/security-181' into ticket/security-181-rhea | Marc Alexander | 2017-01-06 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | [ticket/security-181] Update wording in INSTALL.html | Marc Alexander | 2017-01-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-181 | ||||
| | * | | | | | | | [ticket/security-181] Add .htaccess to 3.2.x migrations | Marc Alexander | 2016-11-13 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-181 | ||||
| | * | | | | | | | Merge branch 'ticket/security-181' into ticket/security-181-rhea | Marc Alexander | 2016-11-13 | 8 | -4/+129 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | [ticket/security-181] Update INSTALL.html to ask for more secure apache config | Marc Alexander | 2016-11-13 | 2 | -3/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-181 | ||||
| | | * | | | | | | [ticket/security-181] Port .htaccess changes to other webserver types | Marc Alexander | 2016-11-13 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-181 | ||||
| | | * | | | | | | [ticket/security-181] Deny access to migrations folders | Marc Alexander | 2016-11-13 | 3 | -0/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-181 | ||||
* | | | | | | | | | [3.2.x] Update version numbers for 3.2.2-dev | Marc Alexander | 2017-07-11 | 2 | -2/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | [prep-release-3.2.1] Add changelog since 3.2.0 | Marc Alexander | 2017-06-25 | 1 | -0/+108 |
| | | | | | | | | |||||
* | | | | | | | | [prep-release-3.2.1] Add migration for 3.2.1-RC1 | Marc Alexander | 2017-06-25 | 1 | -0/+39 |
| | | | | | | | | |||||
* | | | | | | | | [prep-release-3.2.1] Update version numbers for 3.2.1-RC1 | Marc Alexander | 2017-06-25 | 5 | -6/+6 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1 | Marc Alexander | 2017-06-25 | 2 | -0/+188 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | [prep-release-3.1.11] Update changelog | Marc Alexander | 2017-06-25 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch '3.1.x' into prep-release-3.1.11 | Marc Alexander | 2017-06-25 | 2 | -9/+50 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | [prep-release-3.1.11] Update changelog for 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 1 | -0/+144 |
| | | | | | | | | |||||
| * | | | | | | | [prep-release-3.1.11] Add migration for update to 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 1 | -0/+43 |
| | | | | | | | | |||||
| * | | | | | | | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1 | Marc Alexander | 2017-06-25 | 5 | -7/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 2 | -9/+50 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #4804 from rxu/ticket/15186 | Marc Alexander | 2017-06-25 | 2 | -9/+50 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | [ticket/15186] Fully implement the force_delete_allowed feature | ||||
| | * | | | | | | [ticket/15186] Fully implement the force_delete_allowed feature | rxu | 2017-04-19 | 2 | -9/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15186 | ||||
* | | | | | | | | Merge branch '3.1.x' into 3.2.x | Marc Alexander | 2017-06-25 | 1 | -17/+30 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |