aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
|\ \ | | | | | | | | | | | | * Marc/ticket/10851: [ticket/10851] Set disallowed content to empty array if checking is disabled
| * | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The disallowed content defaults to a standard set of mimetype triggers by default. If one doesn't want to check the attachments mimetype triggers then we need to set the disallowed content to an empty array. PHPBB3-10851
* | | Merge remote-tracking branch 'Elsensee/ticket/12353' into develop-olympusJoas Schilling2014-04-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * Elsensee/ticket/12353: [ticket/12353] Fix displayed attachments in ACP
| * | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
|/ / / | | | | | | | | | PHPBB3-12353
* | | Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympusJoas Schilling2014-04-031-2/+1
|\ \ \ | |/ / |/| | | | | | | | * bantu/ticket/12318: [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
| * | [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."Andreas Fischer2014-04-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6614f2078740675ca0228b348500991888c2140 as the install command started failing with "Version '3.0.0~precise' for 'hhvm' was not found" in the meantime. PHPBB3-12318
* | | Merge remote-tracking branch 'Elsensee/ticket/12341' into develop-olympusJoas Schilling2014-04-031-0/+125
|\ \ \ | |/ / |/| | | | | | | | * Elsensee/ticket/12341: [ticket/12341] Add tests for get_username_string()
| * | [ticket/12341] Add tests for get_username_string()Oliver Schramm2014-04-011-0/+125
|/ / | | | | | | PHPBB3-12341
* | Merge remote-tracking branch 'bantu/ticket/12318-olympus' into develop-olympusJoas Schilling2014-03-311-29/+54
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12318-olympus: [ticket/12318] Use MySQL instead of MySQLi for now on HHVM. [ticket/12318] Pin HHVM version to 3.0.0~precise. [ticket/12318] Always install new config file on HHVM upgrade conflict. [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04. [ticket/12318] Upgrade to a recent stable version of HHVM. [ticket/12318] Correctly setup HHVM for functional tests.
| * | [ticket/12318] Use MySQL instead of MySQLi for now on HHVM.Andreas Fischer2014-03-301-0/+4
| | | | | | | | | | | | PHPBB3-12318
| * | [ticket/12318] Pin HHVM version to 3.0.0~precise.Andreas Fischer2014-03-301-1/+2
| | | | | | | | | | | | PHPBB3-12318
| * | [ticket/12318] Always install new config file on HHVM upgrade conflict.Andreas Fischer2014-03-301-1/+1
| | | | | | | | | | | | PHPBB3-12318
| * | [ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.Andreas Fischer2014-03-301-0/+6
| | | | | | | | | | | | PHPBB3-12318
| * | [ticket/12318] Upgrade to a recent stable version of HHVM.Andreas Fischer2014-03-301-0/+3
| | | | | | | | | | | | PHPBB3-12318
| * | [ticket/12318] Correctly setup HHVM for functional tests.Andreas Fischer2014-03-301-29/+40
|/ / | | | | | | PHPBB3-12318
* | Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympusAndreas Fischer2014-03-301-3/+5
|\ \ | | | | | | | | | | | | * VSEphpbb/ticket/12316: [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
| * | [ticket/12316] Add Build Status Icon for develop-ascraeus to README.mdMatt Friedman2014-03-301-3/+5
|/ / | | | | | | PHPBB3-12316
* | Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympusJoas Schilling2014-03-291-0/+3
|\ \ | | | | | | | | | | | | * bantu/ticket/12319: [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.
| * | [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.Andreas Fischer2014-03-291-0/+3
|/ / | | | | | | PHPBB3-12319
* | Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into ↵Joas Schilling2014-03-294-338/+448
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * noxwizard/ticket/naderman/9725: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema
| * [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4
| | | | | | | | PHPBB3-9725