aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
|\ | | | | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string
| * [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | | | | | | PHPBB3-13519
* | Merge pull request #3310 from bantu/ticket/13523Joas Schilling2015-01-202-2/+24
|\ \ | | | | | | | | | [ticket/13523] Install PHPUnit manually instead of from PEAR.
| * | [ticket/13523] Install PHPUnit manually instead of from PEAR.Andreas Fischer2015-01-202-2/+24
|/ / | | | | | | | | | | The pear.phpunit.de channel has been shut down in 2014. PHPBB3-13523
* | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
|\ \ | |/ |/| [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| * [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | PHPBB3-10985
* | Merge pull request #3188 from marc1706/ticket/11613Tristan Darricau2014-11-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/11613] Allow cookies for domains without dots * marc1706/ticket/11613: [ticket/11613] Allow cookies to work on netbios domains
| * | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
|/ / | | | | | | PHPBB3-11613
* | 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
* | 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 #3146 from bantu/ticket/13341Joas Schilling2014-11-171-3/+3
|\ \ | | | | | | | | | [ticket/13341] Change coverage to whitelist to prevent errors with temp ...
| * | [ticket/13341] Change coverage to whitelist to prevent errors with temp files.Andreas Fischer2014-11-141-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4f95deefc9d456c5a2d0f6338f6dcecc0829652 suggests that this can lead to issues with classes having the same name. However, this does not seem to be a problem with the current version of PHPUnit we are using. Despite https://phpunit.de/manual/4.1/en/code-coverage-analysis.html saying that addUncoveredFilesFromWhitelist="true" is optional, this seems to be on by default in PHPUnit 4.1.0. As a result, all files are considered for code coverage; which is what we want. processUncoveredFilesFromWhitelist is however false (by default) and as such even files that are considered for code coverage are not processed through PHP when not used in actual tests. Since it is already impossible to test multiple classes with the same name in the same test run (without process isolation), because that would already lead to "cannot redeclare class" errors, it is also impossible for "cannot redeclare class" errors to happen in test coverage. PHPBB3-13341
* | Merge pull request #3142 from bantu/ticket/13331Joas Schilling2014-11-124-42/+69
|\ \ | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
| * | [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
| | | | | | | | | | | | PHPBB3-13331
| * | Merge pull request #3133 from bantu/ticket/13324Tristan Darricau2014-11-111-22/+18
| |\ \ |/ / / | | | | | | | | | | | | | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location * bantu/ticket/13324: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| * | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
|/ / | | | | | | PHPBB3-13324
* | Merge pull request #3090 from Nicofuma/ticket/13234Joas Schilling2014-10-281-30/+39
|\ \ | | | | | | | | | Ticket/13234
| * | [ticket/13234] Fix conditions and CSTristan Darricau2014-10-281-2/+2
| | | | | | | | | | | | PHPBB3-13234
| * | [ticket/13234] Never allow autologin/remember me to modify the useridNils Adermann2014-10-271-31/+40
|/ / | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234
* | Merge pull request #3051 from nickvergessen/ticket/12120Marc Alexander2014-10-211-1/+1
|\ \ | | | | | | | | | [ticket/12120] Remove EXreaction from active authors
| * | [ticket/12120] Remove EXreaction from active authorsJoas Schilling2014-10-211-1/+1
|/ / | | | | | | PHPBB3-12120
* | Merge pull request #3047 from Elsensee/ticket/13168Andreas Fischer2014-10-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility * Elsensee/ticket/13168: [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
| * | [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibilityOliver Schramm2014-10-201-2/+2
| | | | | | | | | | | | PHPBB3-13168
* | | Merge pull request #3039 from nickvergessen/ticket/13138Nils Adermann2014-10-201-28/+31
|\ \ \ | |/ / |/| | [ticket/13138] Only use cookie data when we do not force a user_id
| * | [ticket/13138] Do not use cookie data and autologin while forcing a user_idJoas Schilling2014-10-161-28/+31
|/ / | | | | | | PHPBB3-13138
* | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-064-2/+286
|\ \ | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
| * | [ticket/11224] Adds a test caseTristan Darricau2014-09-241-0/+16
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Remove new line in acm_memory.phpTristan Darricau2014-05-151-1/+1
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Use assertNotEquals(false) instead of assertNotFalse()Tristan Darricau2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | assertNotFalse() is unavailable with the version of phpunit used with php 5.2 PHPBB3-11224
| * | [ticket/11224] Fix coding styleTristan Darricau2014-05-151-2/+2
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Add unit testTristan Darricau2014-05-153-0/+256
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Fix the blank line after ?>Tristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] Fix returned dataTristan Darricau2014-05-141-2/+2
| | | | | | | | | | | | PHPBB3-11224
| * | [ticket/11224] SQL cache destroy does not destroy queries to tables joinedTristan Darricau2014-05-141-3/+15
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11224 PHPBB3-11224
* | | Merge pull request #2994 from Skouat/ticket/13086-olympusAndreas Fischer2014-09-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key * Skouat/ticket/13086-olympus: [ticket/13086] String replaces 50 with 20
| * | | [ticket/13086] String replaces 50 with 20Mario Skouat2014-09-241-1/+1
|/ / / | | | | | | | | | PHPBB3-13086
* | | Merge pull request #2989 from Senky/ticket/13096Andreas Fischer2014-09-231-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/13096] ldap_escape() added to PHP 5.6.0 * Senky/ticket/13096: [ticket/13096] Add phpbb_ prefix to ldap_escape()
| * | [ticket/13096] Add phpbb_ prefix to ldap_escape()Jakub Senko2014-09-231-2/+2
|/ / | | | | | | PHPBB3-13096
* | Merge pull request #2981 from nickvergessen/ticket/10729Marc Alexander2014-09-234-8/+994
|\ \ | | | | | | | | | Ticket/10729 Update editor information when user being deleted
| * | [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2Joas Schilling2014-09-231-1/+2
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Ensure that no bans exist before testing create_sessionJoas Schilling2014-09-221-0/+7
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Add assert messages and finish up testsJoas Schilling2014-09-222-27/+228
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Add tests for some special tables with unique conditionsJoas Schilling2014-09-222-103/+223
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Add tests for user posts, reports and attachmentsJoas Schilling2014-09-222-0/+645
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Fix doc block for user_deleteJoas Schilling2014-09-221-3/+8
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Update message_edit_user when user being deletedOliver Schramm2014-07-181-0/+6
| | | | | | | | | | | | PHPBB3-10729
| * | [ticket/10729] Update post_edit_user when user being deletedOliver Schramm2014-07-171-5/+6
| | | | | | | | | | | | PHPBB3-10729
* | | Merge pull request #2808 from nickvergessen/ticket/12917Andreas Fischer2014-08-071-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12917] Check commit message and image ICC profile on 5.3.3 * nickvergessen/ticket/12917: [ticket/12917] Check commit message and image ICC profile on 5.3.3