aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.12' into 3.1.xMarc Alexander2017-12-3116-14/+203
|\
| * [prep-release-3.1.12] Update changelog for 3.1.12Marc Alexander2017-12-311-0/+44
| * [prep-release-3.1.12] Add migration for 3.1.12Marc Alexander2017-12-311-0/+36
| * Merge pull request #40 from phpbb/ticket/security/211Marc Alexander2017-12-317-5/+114
| |\
| | * [ticket/security/211] Allow make_clickable() again after change to regexMarc Alexander2017-08-033-4/+3
| | * [ticket/security/211] Add test for line breaks in URLMarc Alexander2017-07-271-0/+4
| | * [ticket/security/211] Do not match javascript URIs with URL regexesMarc Alexander2017-07-263-3/+11
| | * [ticket/security/211] Extend tests for profile field valuesMarc Alexander2017-07-232-0/+66
| | * [ticket/security/211] Only run make_clickable() on URL type profile fieldsMarc Alexander2017-07-232-1/+15
| | * [ticket/security/211] Make sure website URL only uses http & https schemesMarc Alexander2017-07-224-2/+20
| * | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-313-3/+3
| * | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-313-5/+5
| * | [ticket/15303] Correctly refer to $memcached and not $memcacheabyssmedia2017-12-311-1/+1
|/ /
* | Merge pull request #4929 from marc1706/ticket/15347Oliver Schramm2017-09-082-6/+6
|\ \ | |/ |/|
| * [ticket/15347] Fix query quotes in update hashes cli commandMarc Alexander2017-09-081-3/+3
| * [ticket/15347] Use single quotes in update hashes queryMarc Alexander2017-09-071-3/+3
|/
* Merge pull request #4872 from Nicofuma/ticket/15285Marc Alexander2017-07-201-0/+2
|\
| * [ticket/15285] Updates .travis.yml to fix builds issuesTristan Darricau2017-07-201-0/+2
* | Merge branch 'prep-release-3.1.11' into 3.1.xMarc Alexander2017-07-1619-47/+463
|\ \
| * | [prep-release-3.1.11] Add migration for 3.1.11Marc Alexander2017-07-161-0/+36
| * | [prep-release-3.1.11] Update version numbers to 3.1.11Marc Alexander2017-07-163-4/+4
| * | Merge pull request #38 from phpbb/ticket/security/210Marc Alexander2017-07-163-2/+70
| |\ \
| | * | [ticket/security/210] Adjust regex and add tests for IPv6Marc Alexander2017-07-103-5/+8
| | * | [ticket/security/210] Prevent using IP addresses or ports for remote avatarMarc Alexander2017-07-093-2/+67
| * | | Merge pull request #32 from phpbb/ticket/security-203Marc Alexander2017-07-164-39/+198
| |\ \ \
| | * | | [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 #29 from phpbb/ticket/security-181Marc Alexander2017-07-168-5/+130
| |\ \ \ \
| | * | | | [ticket/security-181] Update wording in INSTALL.htmlMarc Alexander2017-01-061-3/+3
| | * | | | [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
| * | | | | Merge pull request #37 from phpbb/ticket/security/208Marc Alexander2017-07-161-0/+7
| |\ \ \ \ \
| | * | | | | [ticket/security/208] Add form key to password reset formMarc Alexander2017-06-181-0/+7
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #36 from phpbb/ticket/security/124Marc Alexander2017-07-161-0/+21
| |\ \ \ \ \
| | * | | | | [ticket/security/124] Filter out disallowed search query itemsMarc Alexander2017-06-181-0/+21
| | |/ / / /
* | | | | | [3.1.x] Update version number to 3.1.12-devMarc Alexander2017-07-113-5/+5
* | | | | | Merge branch 'prep-release-3.1.11' into 3.1.xMarc Alexander2017-07-118-10/+198
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | [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
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | 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
| | * | | | [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 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 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