| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3170 from Nicofuma/ticket/13266-develop | Joas Schilling | 2014-12-27 | 2 | -1/+13 |
| |\ | | | | | | | [ticket/13266-develop] Enable twig dump function | ||||
| | * | [ticket/13266] Enable the debug extension in the development environment | Tristan Darricau | 2014-11-22 | 2 | -1/+13 |
| | | | | | | | | | PHPBB3-13266 | ||||
| * | | Merge pull request #3220 from nickvergessen/ticket/13421 | Marc Alexander | 2014-12-10 | 8 | -108/+259 |
| |\ \ | | | | | | | | | | Ticket/13421 Introduce an interface for db\tools.php | ||||
| | * | | [ticket/13421] Move tools to subdirectory | Joas Schilling | 2014-12-06 | 8 | -15/+15 |
| | | | | | | | | | | | | | PHPBB3-13421 | ||||
| | * | | [ticket/13421] Always require the interface when possible | Joas Schilling | 2014-12-06 | 3 | -6/+6 |
| | | | | | | | | | | | | | PHPBB3-13421 | ||||
| | * | | [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-12-06 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | [ticket/13396] Normalize multibyte characters in attachment file names. | Cesar G | 2014-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13396 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-30 | 1 | -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.php | rxu | 2014-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13405 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-29 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | [ticket/13393] Call user->lang function directly | Oliver Schramm | 2014-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | PHPBB3-13393 | ||||
| * | | | 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 | 2 | -0/+63 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add migration to update version to 3.1.2 | Joas Schilling | 2014-11-24 | 1 | -0/+31 |
| | | | | | |||||
| | * | | | [prep-release-3.1.2] Add migration for 3.1.2-RC1 | Joas Schilling | 2014-11-22 | 1 | -0/+32 |
| | | | | | |||||
| * | | | | 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 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'ticket/13358' into ticket/security-171 | Marc Alexander | 2014-11-21 | 2 | -5/+136 |
| | | |\ \ \ \ | |||||
| | | * | | | | | [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 | 2 | -5/+136 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| | * | | | | | | Merge pull request #3157 from marc1706/ticket/13358 | Joas Schilling | 2014-11-22 | 2 | -5/+136 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | [ticket/13358] Add class for retrieving remote file data | ||||
| | | * | | | | | [ticket/13358] Correctly create version_helper in acp_extensions | Marc Alexander | 2014-11-22 | 1 | -1/+1 |
| | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -21/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | | * | | | | [ticket/13358] Fix tests and use exceptions instead of user object | Marc Alexander | 2014-11-21 | 2 | -20/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | | * | | | | [ticket/13358] Add file_downloader to version_helper | Marc Alexander | 2014-11-21 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13358 | ||||
| | | * | | | | [ticket/13358] Add file_downloader as replacement for get_remote_file | Marc Alexander | 2014-11-21 | 1 | -0/+137 |
| | | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-13358 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/memberlist_email.html | ||||
| | * | | | | Merge pull request #3108 from Elsensee/ticket/13284 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13284] Message body not included in email | ||||
| | | * | | | | [ticket/13284] Set message body in topic form too, so it will be sent | Oliver Schramm | 2014-11-04 | 1 | -1/+1 |
| | | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-13284 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3068 from marc1706/ticket/13204 | Joas Schilling | 2014-11-21 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts | ||||
| | | * | | | | [ticket/13204] Tell user that password was incorrect when exceeding attempts | Marc Alexander | 2014-11-02 | 1 | -1/+1 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the end of the login method, the captcha was entered correctly and only the password was incorrect. Therefore, just tell the user that the password was incorrect. He will see that he still needs to enter a captcha. PHPBB3-13204 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-21 | 1 | -8/+32 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge pull request #3064 from marc1706/ticket/13197 | Joas Schilling | 2014-11-21 | 1 | -8/+32 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/13197] Also delete group avatar from users that have it set | ||||
| | | * | | | | [ticket/13197] Fix tabbing | Marc Alexander | 2014-11-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
| | | * | | | | [ticket/13197] Correctly format sql query | Marc Alexander | 2014-11-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
| | | * | | | | [ticket/13197] Also delete group avatar from users that have it set | Marc Alexander | 2014-10-25 | 1 | -7/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13197 | ||||
