aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * [ticket/10839] Always run functional tests by defaultJoas Schilling2014-05-092-44/+4
|/ | | | | | | | | They are skipped anyway, if $phpbb_functional_url is not configured. If you want to run tests without functional tests, just append --exclude-group functional to your call PHPBB3-10839
* Merge pull request #2396 from Nicofuma/ticket/12485Joas Schilling2014-05-038-17/+61
|\ | | | | | | | | | | | | [ticket/12485] Broken tests due to absolute 'exclude' * Nicofuma/ticket/12485: [ticket/12485] Broken tests due to absolute exclude
| * [ticket/12485] Broken tests due to absolute excludeNicofuma2014-05-038-17/+61
|/ | | | PHPBB3-12485
* Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympusNils Adermann2014-05-031-9/+47
|\ | | | | | | | | * github-bantu/ticket/11860: [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.
| * [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.Andreas Fischer2013-09-231-9/+47
| | | | | | | | PHPBB3-11860
* | Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympusNils Adermann2014-05-022-80/+376
|\ \ | | | | | | | | | | | | * github-bantu/ticket/12429: [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.
| * | [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.Andreas Fischer2014-05-022-80/+376
|/ / | | | | | | PHPBB3-12429
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12472' into ↵Nils Adermann2014-05-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/12472: [ticket/12472] Set fast_finish for travis
| * | [ticket/12472] Set fast_finish for travisJoas Schilling2014-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Now, a build will finish as soon as a job has failed, or when the only jobs left allow failures. http://docs.travis-ci.com/user/build-configuration/#Fast-finishing PHPBB3-12472
* | | Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympusMarc Alexander2014-05-021-0/+1
|\ \ \ | |/ / |/| | | | | | | | * nickvergessen/ticket/12120: [ticket/12120] Add Marc Alexander to AUTHORS
| * | [ticket/12120] Add Marc Alexander to AUTHORSJoas Schilling2014-05-021-0/+1
|/ / | | | | | | PHPBB3-12120
* | Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympusNils Adermann2014-05-022-7/+6
|\ \ | | | | | | | | | | | | | | | * github-bantu/ticket/12468: [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'. [ticket/12467] Add config*.php and tests_config*.php to .gitignore
| * | [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.Andreas Fischer2014-05-021-3/+4
| | | | | | | | | | | | PHPBB3-12468
| * | Merge pull request #2371 from nickvergessen/ticket/12467Andreas Fischer2014-05-021-4/+2
| |\ \ |/ / / | | | | | | | | | | | | | | | [ticket/12467] Add config*.php and tests_config*.php to .gitignore * nickvergessen/ticket/12467: [ticket/12467] Add config*.php and tests_config*.php to .gitignore
| * | [ticket/12467] Add config*.php and tests_config*.php to .gitignoreJoas Schilling2014-05-021-4/+2
|/ / | | | | | | PHPBB3-12467
* | Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into ↵Nils Adermann2014-05-022-2/+2
|\ \ | | | | | | | | | | | | | | | | | | develop-olympus * github-marc1706/ticket/8960-olympus: [ticket/8960] Allow changing avatar path if it's not writable
| * | [ticket/8960] Allow changing avatar path if it's not writableMarc Alexander2014-04-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change will allow users to change the avatar path even if it's not writable. However, this will get rid of the error message that the path is not writable. Due to this, a minor addition to the explain message in the ACP settings has been made. PHPBB3-8960
* | | Merge pull request #2319 from n-aleha/ticket/12186Joas Schilling2014-04-292-1/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12186] Move PM reports below post reports while installing * n-aleha/ticket/12186: [ticket/12186] Move PM reports below post reports while installing
| * | | [ticket/12186] Move PM reports below post reports while installingn-aleha2014-04-232-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | In mcp, move PM reports below post reports while installing. PHPBB3-12186
* | | | Merge pull request #2341 from nickvergessen/ticket/12413Andreas Fischer2014-04-221-70/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus * nickvergessen/ticket/12413: [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
| * | | | [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0Joas Schilling2014-04-221-70/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus" This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f. PHPBB3-12413
* | | | Merge pull request #2324 from bantu/ticket/12417Joas Schilling2014-04-161-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fai... * bantu/ticket/12417: [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."
| * | | [ticket/12417] Revert "No longer allow Travis CI HHVM environment to fail."Andreas Fischer2014-04-161-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | hhvm-nightly 2014.04.16~precise introduced "Attempted to serialize unserializable builtin class DOMElement" errors when running functional tests. This reverts commit ff7cc77f9db66b7fddacd77f215d85cf0243b2fa. PHPBB3-12417
* | | Merge pull request #2310 from n-aleha/ticket/12397Andreas Fischer2014-04-151-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12397] Fix sql_unique_index_exists doc block * n-aleha/ticket/12397: [ticket/12397] Fix sql_unique_index_exists doc block
| * | | [ticket/12397] Fix sql_unique_index_exists doc blockn-aleha2014-04-161-2/+2
| |/ / | | | | | | | | | | | | | | | | | | db_tools::sql_unique_index_exists() searches for unique indexes but not primary key indexes. PHPBB3-12397
* | | Merge pull request #2195 from Elsensee/ticket/10423Joas Schilling2014-04-154-15/+66
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10423] Remove * from search or highlight string * Elsensee/ticket/10423: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
| * | [ticket/10423] Replace foreach with function in viewtopic.phpOliver Schramm2014-04-151-12/+5
| | | | | | | | | | | | PHPBB3-10423
| * | [ticket/10423] Remove unnecessary include in testOliver Schramm2014-04-151-1/+0
| | | | | | | | | | | | PHPBB3-10423
| * | [ticket/10423] Match multiple wildcardsOliver Schramm2014-04-132-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Multiple wildcards are removed from the string if there is no word before or after them. If there is a word before or after them, they are just replaced with a single one. PHPBB3-10423
| * | [ticket/10423] Move code into a function and add tests for itOliver Schramm2014-04-134-5/+60
| | | | | | | | | | | | PHPBB3-10423
| * | [ticket/10423] Remove * from search or highlight stringOliver Schramm2014-03-282-5/+7
| | | | | | | | | | | | PHPBB3-10423
* | | Merge remote-tracking branch 'marc1706/ticket/10687' into develop-olympusCesar G2014-04-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * marc1706/ticket/10687: [ticket/10687] Improve error message if unable to get image dimensions
| * | | [ticket/10687] Improve error message if unable to get image dimensionsMarc Alexander2014-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message that is presented if getimagesize() was unable to determine an image's dimensions now additionally states that this might be caused by an incorrect URL. PHPBB3-10687
* | | | Merge pull request #2279 from Elsensee/ticket/12381Andreas Fischer2014-04-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12381] Fix broken error message when selecting invalid DB driver * Elsensee/ticket/12381: [ticket/12381] Fix broken error message when selecting invalid DB driver
| * | | | [ticket/12381] Fix broken error message when selecting invalid DB driverOliver Schramm2014-04-101-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-12381
* | | | Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympusJoas Schilling2014-04-102-3/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | * bantu/ticket/12320: [ticket/12320] Install a nightly build of HHVM. [ticket/12320] No longer allow Travis CI HHVM environment to fail.
| * | | [ticket/12320] Install a nightly build of HHVM.Andreas Fischer2014-04-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12320
| * | | [ticket/12320] No longer allow Travis CI HHVM environment to fail.Andreas Fischer2014-04-101-2/+0
|/ / / | | | | | | | | | PHPBB3-12320
* | | Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympusAndreas Fischer2014-04-061-3/+3
|\ \ \ | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12359: [ticket/12359] Remove inline width styling on UCP birthday fields
| * | | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
|/ / / | | | | | | | | | PHPBB3-12359
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 06:32:38 +0000