aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 #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
| * [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-233-1/+3
| | | | | | | | PHPBB3-12755
| * [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
|/ | | | PHPBB3-12755
* Merge pull request #2622 from Nicofuma/ticket/12741Andreas Fischer2014-06-191-0/+1
|\ | | | | | | | | | | | | [ticket/12741] Functional tests on Travis fail since php update last night * Nicofuma/ticket/12741: [ticket/12741] Change the mode of the socket file
| * [ticket/12741] Change the mode of the socket fileTristan Darricau2014-06-191-0/+1
|/ | | | | | | Since php 5.4.29, by default, php-fpm creates the socket with the 0600 mode instead of 0666. PHPBB3-12741
* Merge pull request #2608 from dhruvgoel92/ticket/12720Andreas Fischer2014-06-161-2/+2
|\ | | | | | | | | | | | | [ticket/12720] Allow commit heading to begin with lowercase letters * dhruvgoel92/ticket/12720: [ticket/12720] Allow commit heading to begin with lowercase letters
| * [ticket/12720] Allow commit heading to begin with lowercase lettersDhruv2014-06-161-2/+2
|/ | | | PHPBB3-12720
* Merge pull request #2548 from bantu/ticket/12660Dhruv Goel2014-06-091-1/+1
|\ | | | | [ticket/12660] Improve check for when phpinfo() is disabled.
| * [ticket/12660] Improve check for when phpinfo() is disabled.Andreas Fischer2014-06-091-1/+1
|/ | | | PHPBB3-12660
* Merge pull request #2282 from bantu/ticket/12384Joas Schilling2014-05-281-4/+0
|\ | | | | | | | | | | | | [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. * bantu/ticket/12384: [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
| * [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.Andreas Fischer2014-04-121-4/+0
| | | | | | | | | | | | HHVM MySQLi has been fixed and works for us now. PHPBB3-12384
* | Merge pull request #2498 from bantu/ticket/12582Joas Schilling2014-05-283-0/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12582] Strip away copyrighted ICC profile from images * bantu/ticket/12582: [ticket/12582] Fix coding style. [ticket/12582] Remove set -e due to exiftool not liking 0 byte files. [ticket/12582] Strip away copyrighted ICC profile [ticket/12582] Change strip_icc_profiles.sh to only take a single file. [ticket/12582] Run strip_icc_profiles.sh on Travis CI. [ticket/12582] Overwrite inplace instead of creating _original files. [ticket/12582] Add script for strippping ICC profiles from images.
| * | [ticket/12582] Fix coding style.Andreas Fischer2014-05-271-1/+2
| | | | | | | | | | | | PHPBB3-12582
| * | [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.Andreas Fischer2014-05-271-1/+0
| | | | | | | | | | | | PHPBB3-12582
| * | [ticket/12582] Strip away copyrighted ICC profileDavid Prévot2014-05-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This images embed a non free ICC profile that doesn’t allow modification: http://web.archive.org/web/20020603153925/srgb.com/usingsrgb.html Please use the proposed version stripping away this copyrighted binary profile, probably embedded by an image software at one time: exiftool -icc_profile"-<=" phpBB/adm/images/phpbb_logo.png I’ve checked the resulting image and trust it is identical to the original. Some more background on the issue: https://lists.debian.org/debian-devel/2014/05/msg00339.html PHPBB3-12582
| * | [ticket/12582] Change strip_icc_profiles.sh to only take a single file.Andreas Fischer2014-05-272-21/+14
| | | | | | | | | | | | PHPBB3-12582
| * | [ticket/12582] Run strip_icc_profiles.sh on Travis CI.Andreas Fischer2014-05-271-0/+2
| | | | | | | | | | | | PHPBB3-12582
| * | [ticket/12582] Overwrite inplace instead of creating _original files.Andreas Fischer2014-05-271-1/+1
| | | | | | | | | | | | PHPBB3-12582
| * | [ticket/12582] Add script for strippping ICC profiles from images.Andreas Fischer2014-05-271-0/+33
| | | | | | | | | | | | PHPBB3-12582
* | | Merge pull request #2470 from bantu/task/samiJoas Schilling2014-05-185-155/+418
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | [task/sami] Add Sami to composer dependencies and build script * bantu/task/sami: [task/sami] Establish alphabetical order. [task/sami] Also ignore ext/ directory. [task/sami] Replace phpdoctor with sami. [task/sami] Add sami/sami as a composer development dependency.
| * | [task/sami] Establish alphabetical order.Andreas Fischer2014-05-171-1/+1
| | | | | | | | | | | | PHPBB3-12495
| * | [task/sami] Also ignore ext/ directory.Andreas Fischer2014-05-171-0/+1
| | | | | | | | | | | | PHPBB3-12495
| * | [task/sami] Replace phpdoctor with sami.Andreas Fischer2014-05-163-153/+51
| | | | | | | | | | | | PHPBB3-12495
| * | [task/sami] Add sami/sami as a composer development dependency.Andreas Fischer2014-05-162-2/+366
|/ / | | | | | | PHPBB3-12495
* | Merge pull request #2454 from nickvergessen/ticket/12540Andreas Fischer2014-05-153-3/+3
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12540] Fix broken placeholders in language files * nickvergessen/ticket/12540: [ticket/12540] Fix broken placeholders in language files
| * | [ticket/12540] Fix broken placeholders in language filesJoas Schilling2014-05-133-3/+3
|/ / | | | | | | PHPBB3-12540
* | Merge pull request #2430 from nickvergessen/ticket/10839-olympusAndreas Fischer2014-05-105-83/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/10839] olympus - Remove phpunit configuration files * nickvergessen/ticket/10839-olympus: [ticket/10839] Fix note about running slow tests and build task [ticket/10839] Removing phpunit.xml.all [ticket/10839] Always run functional tests by default
| * | [ticket/10839] Fix note about running slow tests and build taskJoas Schilling2014-05-092-6/+9
| | | | | | | | | | | | PHPBB3-10839
| * | [ticket/10839] Removing phpunit.xml.allJoas Schilling2014-05-091-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | To run all tests, just append --group slow to your call PHPBB3-10839