aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3183 from Nicofuma/ticket/13362Joas Schilling2014-11-251-4/+3
|\ | | | | | | [ticket/13362] Ignore the whole cache directory in git
| * [ticket/13362] Ignore the whole cache directory in gitTristan Darricau2014-11-251-4/+3
| | | | | | | | PHPBB3-13362
* | Merge branch 'prep-release-3.1.2' into develop-ascraeusJoas Schilling2014-11-2510-69/+196
|\ \
| * | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-253-5/+5
| | |
| * | Merge branch 'develop-olympus' into prep-release-3.1.2Joas Schilling2014-11-251-23/+5
| |\ \
| | * \ Merge pull request #3180 from naderman/ticket/13376Joas Schilling2014-11-251-23/+5
| | |\ \ | | | | | | | | | | | | | | | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3
| | | * | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3Nils Adermann2014-11-251-23/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376
| * | | [prep-release-3.1.2] Update Changelog with 13376Joas Schilling2014-11-251-0/+1
| | | |
| * | | [prep-release-3.1.2] Add migration to update version to 3.1.2Joas Schilling2014-11-241-0/+31
| | | |
| * | | [prep-release-3.1.2] Increase version number to 3.1.2Joas Schilling2014-11-243-5/+5
| | | |
| * | | [prep-release-3.1.2] Add changelog for 3.1.2-RC1Joas Schilling2014-11-221-0/+78
| | | |
| * | | [prep-release-3.1.2] Prepare ChangelogJoas Schilling2014-11-221-36/+39
| | | |
| * | | [prep-release-3.1.2] Add migration for 3.1.2-RC1Joas Schilling2014-11-221-0/+32
| | | |
| * | | [prep-release-3.1.2] Update version to 3.1.2-RC1Joas Schilling2014-11-226-8/+8
|/ / /
* | | Merge pull request #10 from phpbb/ticket/security-171Joas Schilling2014-11-226-20/+236
|\ \ \ | | | | | | | | | | | | [ticket/security-171] Use type cast helper for json data
| * | | [ticket/security-171] Remove duplicate semicolon from testsMarc Alexander2014-11-221-1/+1
| | | | | | | | | | | | | | | | SECURITY-171
| * | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-222-2/+2
| |\ \ \
| * | | | [ticket/security-171] Modify tests for new file_downloader classMarc Alexander2014-11-212-12/+31
| | | | | | | | | | | | | | | | | | | | SECURITY-171
| * | | | Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-216-61/+153
| |\ \ \ \
| * | | | | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-212-5/+189
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| * | | | | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-213-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| * | | | | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
* | | | | | Merge pull request #8 from phpbb/ticket/security-169Joas Schilling2014-11-222-1/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | [ticket/security-169] Stop loop through referer dir in top directory
| * | | | | [ticket/security-169] Stop loop through referer dir in top directoryMarc Alexander2014-11-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-169
* | | | | | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-227-62/+154
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/13358] Add class for retrieving remote file data
| * | | | | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-222-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358
| * | | | [ticket/13358] Use protected and public keywords where applicableMarc Alexander2014-11-211-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| * | | | [ticket/13358] Do not pass variables by referenceMarc Alexander2014-11-213-25/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| * | | | [ticket/13358] Fix tests and use exceptions instead of user objectMarc Alexander2014-11-215-22/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| * | | | [ticket/13358] Use file_downloader in get_remote_file()Marc Alexander2014-11-211-57/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_remote_file() has been marked as deprecated. PHPBB3-13358
| * | | | [ticket/13358] Add file_downloader to version_helperMarc Alexander2014-11-212-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13358
| * | | | [ticket/13358] Add file_downloader as replacement for get_remote_fileMarc Alexander2014-11-212-0/+142
| | |/ / | |/| | | | | | | | | | PHPBB3-13358
* | | | Merge pull request #3123 from Elsensee/ticket/13310Joas Schilling2014-11-221-7/+21
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13310] Add event core.acp_email_modify_sql
| * | | | [ticket/13310] Add event core.acp_email_modify_sqlOliver Schramm2014-11-091-1/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-13310
| * | | | [ticket/13310] Always use sql_build_query in acp_email.phpOliver Schramm2014-11-091-6/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-13310
* | | | | Merge pull request #3160 from PayBas/ticket/13228Joas Schilling2014-11-222-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13228] Fix codebox "select all" font-size in UCP and MCP
| * | | | | [ticket/13228] Gotta use !important after all. Too badPayBas2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13228
| * | | | | [ticket/13228] Fix codebox "select all" font-size in UCP and MCPPayBas2014-11-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13228
* | | | | | Merge pull request #3116 from rxu/ticket/13297Joas Schilling2014-11-223-11/+111
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns
| * | | | | | [ticket/13297] Add unicode modifier to url/email regular expression patterns.rxu2014-11-093-11/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13297
* | | | | | | Merge pull request #3158 from prototech/ticket/13354Joas Schilling2014-11-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs.
| * | | | | | | [ticket/13354] Fix incorrect column name when deleting all topic logs.Cesar G2014-11-211-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13354
* | | | | | | Merge pull request #3161 from Crizz0/ticket/12885Joas Schilling2014-11-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12885] New if for Index-page - board-index-text switch
| * | | | | | | [ticket/12885] New if for Index-page - board-index-text switchCrizzo2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12885
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-221-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #3164 from Crizz0/ticket/10442Joas Schilling2014-11-221-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctness
| | * | | | | | | [ticket/10442] Adds <dd>&nbsp;</dd> to <dl> for xhtml correctnessCrizzo2014-11-221-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10442
* | | | | | | | Merge pull request #3094 from nickvergessen/ticket/10744Marc Alexander2014-11-222-2/+26
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | Ticket/10744 Prevent installing styles with reserved names
| * | | | | | | [ticket/10744] Fix some doc blocksJoas Schilling2014-11-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744
| * | | | | | | [ticket/10744] Type hint objects for IDE usagesJoas Schilling2014-11-211-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10744