aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 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
| * [ticket/9725] Do not use deprecated views to remove default constraintsPatrick Webster2014-03-281-32/+84
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Move primary key creation to the correct locationPatrick Webster2014-03-281-9/+9
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Remove trailing spaces from MSSQL schemaPatrick Webster2014-03-282-174/+174
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Create MSSQL primary keys if none existPatrick Webster2014-03-281-0/+9
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Remove explicit filegroup designationsPatrick Webster2014-03-281-17/+4
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Fetch Azure db stats from proper tablePatrick Webster2014-03-281-0/+16
| | | | | | | | PHPBB3-9725
| * [ticket/9725] Add dummy indexes for AzureHenry Sudhof2014-03-012-56/+56
| | | | | | | | | | | | | | | | | | SQL Azure requires a primary AKA clustered key on every table. This adds a dummy INT column to act as key, avoiding possible duplicate entries. so that these columns can support bigger (speak: huge) tables PHPBB3-9725
| * [ticket/9725] Create an Azure SQL compatible SchemaHenry Sudhof2014-03-012-279/+325
| | | | | | | | | | | | | | | | | | | | Two problems were encountered when installing on AzureSQL: -Azure SQL does not support the ON clause of T-SQL -Azure SQL requries a clustered index AKA primary key on all tables The fix is makeshift; it introduces questionable primary indices, which should be replaced with auto--increment columns. PHPBB3-9725
* | Merge remote-tracking branch 'bantu/ticket/12257' into develop-olympusJoas Schilling2014-03-271-0/+1
|\ \ | | | | | | | | | | | | * bantu/ticket/12257: [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
| * | [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.Andreas Fischer2014-03-241-0/+1
| | | | | | | | | | | | PHPBB3-12257
* | | Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympusNils Adermann2014-03-262-3/+4
|\ \ \ | | | | | | | | | | | | | | | | * marshalrusty/ticket/12310: [ticket/12310] Don't autocomplete SMTP user/pass on install
| * | | [ticket/12310] Don't autocomplete SMTP user/pass on installYuriy Rusko2014-03-262-3/+4
|/ / / | | | | | | | | | PHPBB3-12310
* | | Merge pull request #2183 from s9e/ticket/12302Andreas Fischer2014-03-252-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Upgrade all composer.phar to 1.0.0-alpha8 * s9e/ticket/12302: [ticket/12302] Added `--no-dev` to composer call in build.xml [ticket/12302] Updated composer.phar to 1.0.0-alpha8
| * | [ticket/12302] Added `--no-dev` to composer call in build.xmls9e2014-03-251-1/+1
| | | | | | | | | | | | PHPBB3-12302
| * | [ticket/12302] Updated composer.phar to 1.0.0-alpha8s9e2014-03-251-0/+0
|/ / | | | | | | | | | | wget -N https://getcomposer.org/download/1.0.0-alpha8/composer.phar PHPBB3-12302
* | Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympusJoas Schilling2014-03-242-3/+3
|\ \ | | | | | | | | | | | | * schosser/ticket/10174: [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
| * | [ticket/10174] Rename "Ban usernames" to "Ban users" in ACPDaniel Schosser2014-03-232-3/+3
| | | | | | | | | | | | | | | | | | | | | Changing the language string from "Ban usernames" to "Ban users" to clarify its use. It bans users by their name and not the username itself PHPBB3-10174
* | | Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympusJoas Schilling2014-03-222-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/12035: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page
| * | | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12035