aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3220 from nickvergessen/ticket/13421Marc Alexander2014-12-1015-118/+269
|\ | | | | | | Ticket/13421 Introduce an interface for db\tools.php
| * [ticket/13421] Move tools to subdirectoryJoas Schilling2014-12-0615-25/+25
| | | | | | | | PHPBB3-13421
| * [ticket/13421] Always require the interface when possibleJoas Schilling2014-12-063-6/+6
| | | | | | | | PHPBB3-13421
| * [ticket/13421] Inherit docsJoas Schilling2014-12-061-85/+34
| | | | | | | | PHPBB3-13421
| * [ticket/13421] Add an interface for \phpbb\db\toolsJoas Schilling2014-12-062-11/+213
| | | | | | | | PHPBB3-13421
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-061-1/+1
|\ \
| * \ Merge pull request #3208 from prototech/ticket/13396Joas Schilling2014-12-061-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13396] Normalize multibyte characters in attachment file names.
| | * | [ticket/13396] Normalize multibyte characters in attachment file names.Cesar G2014-12-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13396
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-062-1/+2
|\ \ \ \ | |/ / /
| * | | [ticket/13400] Information text if the server load id high at searchkochi2014-12-062-1/+2
| |/ / | | | | | | | | | PHPBB3-13400
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-301-1/+1
|\ \ \ | |/ / | | / | |/ |/| * develop-ascraeus: [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.php
| * [ticket/13405] Fix a typo in phpbb/migration/data/v310/style_update_p1.phprxu2014-11-301-1/+1
| | | | | | | | PHPBB3-13405
* | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-291-1/+1
|\ \ | |/
| * Merge pull request #3192 from Elsensee/ticket/13393Joas Schilling2014-11-291-1/+1
| |\ | | | | | | | | | [ticket/13393] Call user->lang function directly
| | * [ticket/13393] Call user->lang function directlyOliver Schramm2014-11-271-1/+1
| | | | | | | | | | | | PHPBB3-13393
| * | [ticket/13391] subsilver2 poll options must have a setting of 1 when editing ↵Prosk8er2014-11-261-1/+1
| |/ | | | | | | | | | | a post PHPBB3-13391
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-261-1/+1
|\ \ | |/
| * Merge pull request #3185 from Nicofuma/ticket/13389Marc Alexander2014-11-261-1/+1
| |\ | | | | | | | | | [ticket/13389] Replace pattern with path
| | * [ticket/13389] Replace pattern with pathTristan Darricau2014-11-261-1/+1
| | | | | | | | | | | | PHPBB3-13389
* | | 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] Cookies do not work for netbios domain
| | * [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-221-1/+1
| | | | | | | | | | | | PHPBB3-11613
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-251-10/+10
|\ \ \ | |/ /
| * | [ticket/13381] Fix header intendation of v312.phpJoas Schilling2014-11-251-10/+10
| | | | | | | | | | | | PHPBB3-13381
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-255-60/+187
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | [prep-release-3.1.2] Update the development version to 3.1.3-RC1-devJoas Schilling2014-11-252-2/+2
| | |
| * | Merge branch 'develop-olympus' into prep-release-3.1.2Joas Schilling2014-11-251-23/+5
| |\ \
| | * | [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-242-2/+2
| | | |
| * | | [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-225-7/+7
| | | |
* | | | 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
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security-171] Use type cast helper for json data
| | * \ \ Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-222-2/+2
| | |\ \ \
| | * \ \ \ Merge branch 'ticket/13358' into ticket/security-171Marc Alexander2014-11-214-61/+149
| | |\ \ \ \
| | * | | | | [ticket/security-171] Add tests for retrieved remote data in version_helperMarc Alexander2014-11-211-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | | [ticket/security-171] Sanitize data from composer.jsonMarc Alexander2014-11-211-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
| | * | | | | [ticket/security-171] Use type cast helper for json dataMarc Alexander2014-11-211-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171
* | | | | | | 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 directory
| | * | | | | | [ticket/security-169] Stop loop through referer dir in top directoryMarc Alexander2014-11-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-169
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-225-62/+150
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-225-62/+150
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | [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