aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-063-6/+6
* [ticket/13421] Inherit docsJoas Schilling2014-12-061-85/+34
* [ticket/13421] Add an interface for \phpbb\db\toolsJoas Schilling2014-12-062-11/+213
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-291-1/+1
|\
| * [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ | |/
| * Merge pull request #3075 from Senky/ticket/11613Marc Alexander2014-11-261-1/+1
| |\
| | * [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-251-10/+10
|\ \ \ | |/ /
| * | [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-252-0/+63
|\ \ \ | |/ /
| * | [prep-release-3.1.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| * | [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-20/+33
|\ \ \ | |/ /
| * | Merge pull request #10 from phpbb/ticket/security-171Joas Schilling2014-11-222-20/+33
| |\ \
| | * \ Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-221-1/+1
| | |\ \
| | * \ \ Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-212-5/+136
| | |\ \ \
| | * | | | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-211-5/+8
| | * | | | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-211-11/+23
| | * | | | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-221-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #8 from phpbb/ticket/security-169Joas Schilling2014-11-221-1/+7
| |\ \ \ \ \
| | * | | | | [ticket/security-169] Stop loop through referer dir in top directoryMarc Alexander2014-11-091-1/+7
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-222-5/+136
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-222-5/+136
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-221-1/+1
| | | |_|/ / | | |/| | |
| | * | | | [ticket/13358] Use protected and public keywords where applicableMarc Alexander2014-11-211-3/+3
| | * | | | [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-212-21/+15
| | * | | | [ticket/13358] Fix tests and use exceptions instead of user objectMarc Alexander2014-11-212-20/+13
| | * | | | [ticket/13358] Add file_downloader to version_helperMarc Alexander2014-11-211-2/+9
| | * | | | [ticket/13358] Add file_downloader as replacement for get_remote_fileMarc Alexander2014-11-211-0/+137
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-211-1/+1
| |\ \ \ \
| | * | | | [ticket/13284] Set message body in topic form too, so it will be sentOliver Schramm2014-11-041-1/+1
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3068 from marc1706/ticket/13204Joas Schilling2014-11-211-1/+1
| |\ \ \ \
| | * | | | [ticket/13204] Tell user that password was incorrect when exceeding attemptsMarc Alexander2014-11-021-1/+1
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-8/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-211-8/+32
| |\ \ \ \
| | * | | | [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | * | | | [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | * | | | [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
| |\ \ \ \
| | * | | | [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-211-4/+28
| |\ \ \ \ \
| | * | | | | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4