aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4887 from JoshyPHP/ticket/15304Tristan Darricau2017-08-062-8/+8
|\
| * [ticket/15304] Update s9e/text-formatter dependencyJoshyPHP2017-08-052-8/+8
* | Merge pull request #4886 from marc1706/ticket/15303Tristan Darricau2017-08-061-1/+1
|\ \ | |/ |/|
| * [ticket/15303] Correctly refer to $memcached and not $memcacheabyssmedia2017-08-051-1/+1
|/
* Merge pull request #4879 from marc1706/ticket/15293Tristan Darricau2017-07-266-15/+59
|\
| * [ticket/15293] Prevent continuing to database update on incomplete file updateMarc Alexander2017-07-236-15/+59
|/
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-07-201-0/+2
|\
| * 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 '3.1.x' into 3.2.xMarc Alexander2017-07-160-0/+0
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.11' into 3.1.xMarc Alexander2017-07-1619-47/+463
| |\ \
* | \ \ Merge branch 'prep-release-3.2.1' into 3.2.xMarc Alexander2017-07-1630-84/+644
|\ \ \ \
| * | | | [prep-release-3.2.1] Add missing .htaccess fileMarc Alexander2017-07-161-0/+33
| * | | | Merge branch 'prep-release-3.1.11' into prep-release-3.2.1Marc Alexander2017-07-163-0/+64
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [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
| | |\ \ \
| | * \ \ \ Merge pull request #32 from phpbb/ticket/security-203Marc Alexander2017-07-164-39/+198
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #29 from phpbb/ticket/security-181Marc Alexander2017-07-168-5/+130
| | |\ \ \ \ \
| | * \ \ \ \ \ 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
| | | |/ / / / / /
| * | | | | | | | Merge pull request #4864 from lavigor/ticket/15259Marc Alexander2017-07-162-22/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/15259] Fatal error on SQLite/Oracle database updatelavigor2017-07-061-0/+37
| | * | | | | | | | [ticket/15259] Fatal error on SQLite/Oracle database updatelavigor2017-07-011-22/+14
| * | | | | | | | | 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
* | | | | | | | | | | [3.2.x] Update version numbers for 3.2.2-devMarc Alexander2017-07-113-5/+5