Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/13421] Inherit docs | Joas Schilling | 2014-12-06 | 1 | -85/+34 |
| | | | | PHPBB3-13421 | ||||
* | [ticket/13421] Add an interface for \phpbb\db\tools | Joas Schilling | 2014-12-06 | 2 | -11/+213 |
| | | | | PHPBB3-13421 | ||||
* | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-29 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #3192 from Elsensee/ticket/13393 | Joas Schilling | 2014-11-29 | 1 | -1/+1 |
| |\ | | | | | | | | | | [ticket/13393] Call user->lang function directly | ||||
| | * | [ticket/13393] Call user->lang function directly | Oliver Schramm | 2014-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-13393 | ||||
| * | | [ticket/13391] subsilver2 poll options must have a setting of 1 when editing ↵ | Prosk8er | 2014-11-26 | 1 | -1/+1 |
| |/ | | | | | | | | | | | a post PHPBB3-13391 | ||||
* | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge pull request #3185 from Nicofuma/ticket/13389 | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
| |\ | | | | | | | | | | [ticket/13389] Replace pattern with path | ||||
| | * | [ticket/13389] Replace pattern with path | Tristan Darricau | 2014-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-13389 | ||||
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #3075 from Senky/ticket/11613 | Marc Alexander | 2014-11-26 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | | | | [ticket/11613] Cookies do not work for netbios domain | ||||
| | * | [ticket/11613] Allow cookies to work on netbios domains | Jakub Senko | 2014-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-11613 | ||||
* | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-25 | 1 | -10/+10 |
|\ \ \ | |/ / | |||||
| * | | [ticket/13381] Fix header intendation of v312.php | Joas Schilling | 2014-11-25 | 1 | -10/+10 |
| | | | | | | | | | | | | PHPBB3-13381 | ||||
* | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-25 | 5 | -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-dev | Joas Schilling | 2014-11-25 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'develop-olympus' into prep-release-3.1.2 | Joas Schilling | 2014-11-25 | 1 | -23/+5 |
| |\ \ | |||||
| | * | | [ticket/13376] Revert unnecessary change for cookies called GLOBALS 92f554e3 | Nils Adermann | 2014-11-25 | 1 | -23/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also introduce a clear cookie message hardcoded just in case. PHPBB3-13376 | ||||
| * | | | [prep-release-3.1.2] Update Changelog with 13376 | Joas Schilling | 2014-11-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Add migration to update version to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Increase version number to 3.1.2 | Joas Schilling | 2014-11-24 | 2 | -2/+2 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Add changelog for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+78 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Prepare Changelog | Joas Schilling | 2014-11-22 | 1 | -36/+39 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 |
| | | | | |||||
| * | | | [prep-release-3.1.2] Update version to 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 5 | -7/+7 |
| | | | | |||||
* | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -20/+33 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge pull request #10 from phpbb/ticket/security-171 | Joas Schilling | 2014-11-22 | 2 | -20/+33 |
| |\ \ \ | | | | | | | | | | | | | | | | [ticket/security-171] Use type cast helper for json data | ||||
| | * \ \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-22 | 2 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-21 | 4 | -61/+149 |
| | |\ \ \ \ | |||||
| | * | | | | | [ticket/security-171] Add tests for retrieved remote data in version_helper | Marc Alexander | 2014-11-21 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
| | * | | | | | [ticket/security-171] Sanitize data from composer.json | Marc Alexander | 2014-11-21 | 1 | -11/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
| | * | | | | | [ticket/security-171] Use type cast helper for json data | Marc Alexander | 2014-11-21 | 1 | -9/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-171 | ||||
* | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #8 from phpbb/ticket/security-169 | Joas Schilling | 2014-11-22 | 1 | -1/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/security-169] Stop loop through referer dir in top directory | ||||
| | * | | | | | | [ticket/security-169] Stop loop through referer dir in top directory | Marc Alexander | 2014-11-09 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-169 | ||||
* | | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 5 | -62/+150 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 5 | -62/+150 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | [ticket/13358] Add class for retrieving remote file data | ||||
| | * | | | | | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 2 | -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 applicable | Marc Alexander | 2014-11-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | * | | | | | [ticket/13358] Do not pass variables by reference | Marc Alexander | 2014-11-21 | 3 | -25/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | * | | | | | [ticket/13358] Fix tests and use exceptions instead of user object | Marc Alexander | 2014-11-21 | 3 | -22/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | * | | | | | [ticket/13358] Use file_downloader in get_remote_file() | Marc Alexander | 2014-11-21 | 1 | -57/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_remote_file() has been marked as deprecated. PHPBB3-13358 | ||||
| | * | | | | | [ticket/13358] Add file_downloader to version_helper | Marc Alexander | 2014-11-21 | 2 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | * | | | | | [ticket/13358] Add file_downloader as replacement for get_remote_file | Marc Alexander | 2014-11-21 | 2 | -0/+142 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
* | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 1 | -7/+21 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge pull request #3123 from Elsensee/ticket/13310 | Joas Schilling | 2014-11-22 | 1 | -7/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13310] Add event core.acp_email_modify_sql | ||||
| | * | | | | | [ticket/13310] Add event core.acp_email_modify_sql | Oliver Schramm | 2014-11-09 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310 | ||||
| | * | | | | | [ticket/13310] Always use sql_build_query in acp_email.php | Oliver Schramm | 2014-11-09 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13310 | ||||
* | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-22 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3160 from PayBas/ticket/13228 | Joas Schilling | 2014-11-22 | 2 | -5/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13228] Fix codebox "select all" font-size in UCP and MCP |