aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | [ticket/12917] Check commit message and image ICC profile on 5.3.3Joas Schilling2014-08-071-3/+3
|/ / / | | | | | | | | | PHPBB3-12917
* | | Merge pull request #2350 from Nicofuma/ticket/11480Joas Schilling2014-08-013-9/+125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is full * Nicofuma/ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
| * | | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | | | | | | | | | | | | | | | PHPBB3-11480
| * | | [ticket/11480] Fix the double spaces in phpbb_functional_test_caseTristan Darricau2014-06-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11480
| * | | [ticket/11480] Fix typosTristan Darricau2014-05-291-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11480
| * | | [ticket/11480] Add functionnal testTristan Darricau2014-05-292-8/+123
| | | | | | | | | | | | | | | | PHPBB3-11480
| * | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11480 PHPBB3-11480
* | | | Merge pull request #2425 from Zoddo/ticket/12492Joas Schilling2014-07-301-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | [ticket/12492] Add support of special chars * Zoddo/ticket/12492: [ticket/12492] Add support of special chars
| * | | [ticket/12492] Add support of special charsSkouat2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add support of special chars during db test in the installation PHPBB3-12492
* | | | Merge pull request #2716 from marc1706/ticket/12120Andreas Fischer2014-07-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12120] Remove imkingdavid from active authors * marc1706/ticket/12120: [ticket/12120] Remove imkingdavid from active authors
| * | | | [ticket/12120] Remove imkingdavid from active authorsMarc Alexander2014-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12120
* | | | | Merge pull request #2722 from marc1706/ticket/12695Tristan Darricau2014-07-101-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/12695] Add viewtopic language file for parse_attachments in mcp_... * marc1706/ticket/12695: [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
| * | | | [ticket/12695] Add viewtopic language file for parse_attachments in mcp_postMarc Alexander2014-07-101-0/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12695
* | | | Merge pull request #2685 from nickvergessen/ticket/12120Tristan Darricau2014-07-021-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12120] Add nicofuma to the developers * nickvergessen/ticket/12120: [ticket/12120] Add nicofuma to the developers
| * | | | [ticket/12120] Add nicofuma to the developersJoas Schilling2014-07-021-0/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12120
* | | | Merge pull request #2662 from dhruvgoel92/ticket/12196Andreas Fischer2014-06-262-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12196] Revert Fix typo "referer" in acp/attachments * dhruvgoel92/ticket/12196: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| * | | | [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-272-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
* | | | Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympusDhruv2014-06-262-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12196: [ticket/12196] Fix typo "referer" in acp/attachments
| * | | | [ticket/12196] Fix typo "referer" in acp/attachmentsJoas Schilling2014-06-252-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-12196
* | | | Merge pull request #2633 from marc1706/ticket/12755Andreas Fischer2014-06-243-2/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12755] Add timeout to remote upload to prevent infinite loop * marc1706/ticket/12755: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * | | | [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12755
| * | | | [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Terminate the upload loop if the expected filesize has been reached instead of trying to read more bytes until the timeout has been reached. PHPBB3-12755
| * | | | [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-12755