aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4865 from JoshyPHP/ticket/15261Marc Alexander2017-07-166-15/+27
|\
| * [ticket/15261] Fix censoring HTML tagsJoshyPHP2017-07-036-15/+27
* | [prep-release-3.2.1] Add migration for 3.2.1Marc Alexander2017-07-161-0/+37
* | [prep-release-3.2.1] Update versions for 3.2.1Marc Alexander2017-07-163-4/+4
* | [ticket/security/210] Fix tests for 3.2.xMarc Alexander2017-07-161-2/+1
* | Merge pull request #39 from phpbb/ticket/security/210-rheaMarc Alexander2017-07-163-2/+70
|\ \
| * \ Merge branch 'ticket/security/210' into ticket/security/210-rheaMarc Alexander2017-07-103-5/+8
| |\ \
| | * | [ticket/security/210] Adjust regex and add tests for IPv6Marc Alexander2017-07-103-5/+8
| * | | Merge branch 'ticket/security/210' into ticket/security/210-rheaMarc Alexander2017-07-093-2/+67
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * [ticket/security/210] Prevent using IP addresses or ports for remote avatarMarc Alexander2017-07-093-2/+67
* | | Merge pull request #35 from phpbb/ticket/security-203-rheaMarc Alexander2017-07-164-39/+199
|\ \ \
| * \ \ Merge branch 'ticket/security-203' into ticket/security-203-rheaMarc Alexander2016-12-284-40/+200
| |\ \ \
| | * | | [ticket/security-203] Allow more characters for branch namesMarc Alexander2016-12-271-2/+2
| | * | | [ticket/security-203] Do not add null values to versions infoMarc Alexander2016-12-272-8/+22
| | * | | [ticket/security-203] Fully validate version check data in version helperMarc Alexander2016-12-264-39/+184
* | | | | Merge pull request #30 from phpbb/ticket/security-181-rheaMarc Alexander2017-07-169-4/+162
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ticket/security-181' into ticket/security-181-rheaMarc Alexander2017-01-061-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/security-181] Update wording in INSTALL.htmlMarc Alexander2017-01-061-3/+3
| * | | | | | [ticket/security-181] Add .htaccess to 3.2.x migrationsMarc Alexander2016-11-131-0/+33
| * | | | | | Merge branch 'ticket/security-181' into ticket/security-181-rheaMarc Alexander2016-11-138-4/+129
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/security-181] Update INSTALL.html to ask for more secure apache configMarc Alexander2016-11-132-3/+26
| | * | | | | [ticket/security-181] Port .htaccess changes to other webserver typesMarc Alexander2016-11-133-2/+5
| | * | | | | [ticket/security-181] Deny access to migrations foldersMarc Alexander2016-11-133-0/+99
* | | | | | | [prep-release-3.2.1] Add changelog since 3.2.0Marc Alexander2017-06-251-0/+108
* | | | | | | [prep-release-3.2.1] Add migration for 3.2.1-RC1Marc Alexander2017-06-251-0/+39
* | | | | | | [prep-release-3.2.1] Update version numbers for 3.2.1-RC1Marc Alexander2017-06-256-7/+7
* | | | | | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-06-253-1/+189
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [prep-release-3.1.11] Update changelogMarc Alexander2017-06-251-0/+1
| * | | | | | Merge branch '3.1.x' into prep-release-3.1.11Marc Alexander2017-06-252-9/+50
| |\ \ \ \ \ \
| * | | | | | | [prep-release-3.1.11] Update changelog for 3.1.11-RC1Marc Alexander2017-06-251-0/+144
| * | | | | | | [prep-release-3.1.11] Add migration for update to 3.1.11-RC1Marc Alexander2017-06-251-0/+43
| * | | | | | | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1Marc Alexander2017-06-256-10/+10
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-9/+50
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #4804 from rxu/ticket/15186Marc Alexander2017-06-252-9/+50
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/15186] Fully implement the force_delete_allowed featurerxu2017-04-192-9/+50
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-17/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4860 from marc1706/ticket/14982Marc Alexander2017-06-251-17/+30
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14982] Always do a ban check except on contact me formDavid Colón2017-06-251-17/+30
| |/ / / / / / /
* | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-8/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #4852 from javiexin/ticket/15248Marc Alexander2017-06-251-8/+3
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/15248] Make use of event parameters of core.modify_posting_authjaviexin2017-06-191-8/+3
* | | | | | | | | Merge pull request #4858 from marc1706/ticket/15251Marc Alexander2017-06-251-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15251] Use dispatcher_interface in help managerAgris2017-06-251-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-1/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #4855 from dsinn/ticket/15250Marc Alexander2017-06-251-1/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-252-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #4850 from rxu/ticket/15246Marc Alexander2017-06-252-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/15246] Allow use of Unix socket as memcache(d) hostrxu2017-06-172-4/+4
| | |/ / / / / / /
* | | | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-250-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /