aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-133-5/+18
|\
| * Merge pull request #3141 from bantu/ticket/13325Marc Alexander2014-11-133-5/+18
| |\ | | | | | | | | | [ticket/13325] Make installing composer dependencies in tests folder optional.
| | * [ticket/13325] Make installing composer dependencies in tests folder optional.Andreas Fischer2014-11-122-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19 here. Remove __init__ include. Composer classmap autoloading ensures classes can be loaded. PHPBB3-13325
| | * [ticket/13325] Remove whitespace at end of line.Andreas Fischer2014-11-121-1/+1
| | | | | | | | | | | | PHPBB3-13325
| | * [ticket/13325] Update / Fix composer.lock hash.Andreas Fischer2014-11-121-1/+1
| | | | | | | | | | | | PHPBB3-13325
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-131-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3125 from lavigor/ticket/13318Marc Alexander2014-11-131-1/+1
| |\ \ | | | | | | | | | | | | [ticket/13318] login_username needs to have the multibyte parameter set to true
| | * | [ticket/13318] login_username needs to have the multibyte parameter set to truelavigor2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for usernames with UTF-8 characters. PHPBB3-13318
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-132-2/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #3137 from prototech/ticket/13209Marc Alexander2014-11-132-2/+14
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13209] Fix loss of CPF language field values when switching steps
| | * | | [ticket/13209] Gather language field values for boolean CPF's in all steps.Cesar G2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user can move back and forth between all three steps and as such the lang field data should be expected in all steps. PHPBB3-13209
| | * | | [ticket/13209] Fix expected request value of CPF language fields.Cesar G2014-11-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple languages can be edited, thus the expected value is an array. PHPBB3-13209
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-125-36/+39
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-11-120-0/+0
| |\ \ \ \
| | * \ \ \ Merge pull request #3142 from bantu/ticket/13331Joas Schilling2014-11-124-42/+69
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
| * | \ \ \ \ Merge pull request #3143 from bantu/ticket/13331-ascraeusJoas Schilling2014-11-125-36/+39
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches
| | * | | | | [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php.Andreas Fischer2014-11-122-20/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13331
| | * | | | | Merge pull request #3142 from bantu/ticket/13331Andreas Fischer2014-11-123-16/+38
| | |\ \ \ \ \ | |/ / / / / / | | | | _ / / | | | | / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13331] Use docs target for this branch, add docs-all for all branches * bantu/ticket/13331: [ticket/13331] Use docs target for this branch, add docs-all for dev branches. Conflicts: build/build.xml build/sami-checkout.conf.php
| | * | | | [ticket/13331] Use docs target for this branch, add docs-all for dev branches.Andreas Fischer2014-11-123-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13331
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-121-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3139 from prototech/ticket/13239Marc Alexander2014-11-121-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.
| | * | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated.Cesar G2014-11-111-0/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-13239
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-111-22/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| * | | | | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-11-111-22/+18
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| | * | | | Merge pull request #3133 from bantu/ticket/13324Tristan Darricau2014-11-111-22/+18
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location * bantu/ticket/13324: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
| | | * | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.Andreas Fischer2014-11-111-22/+18
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13324
* | | | | [develop] Update / Fix composer.lock hash.Andreas Fischer2014-11-111-4/+10
| | | | |
* | | | | Merge pull request #1880 from nicolas-grekas/developTristan Darricau2014-11-1121-3450/+178
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback * nicolas-grekas/develop: [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback [feature/patchwork-utf8] Remove utf8_str_replace [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
| * | | | | [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallbackNicolas Grekas2014-11-081-516/+64
| | | | | |
| * | | | | [feature/patchwork-utf8] Remove utf8_str_replaceNicolas Grekas2014-11-082-51/+4
| | | | | |
| * | | | | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallbackNicolas Grekas2014-11-0820-2883/+110
| | | | | |
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-111-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13083] Fix language string NO_ENTRIES for logs
| * | | | | Merge pull request #3112 from Elsensee/ticket/13083Tristan Darricau2014-11-111-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logs * Elsensee/ticket/13083: [ticket/13083] Fix language string NO_ENTRIES for logs
| | * | | | [ticket/13083] Fix language string NO_ENTRIES for logsOliver Schramm2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string was misleading because there does not always have to be a period when viewing log entries. PHPBB3-13083
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-10/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3113 from prototech/ticket/13251Marc Alexander2014-11-091-10/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php.
| | * | | | | [ticket/13251] Escape container parameters defined from config.php.Cesar G2014-11-071-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13251
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-093-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3121 from Elsensee/ticket/13300Joas Schilling2014-11-093-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled
| | * | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabledOliver Schramm2014-11-093-4/+4
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13300
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3120 from Elsensee/ticket/13301Marc Alexander2014-11-091-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13301] Fix called function in apche auth module
| | * | | | | | [ticket/13301] Fix called function in apche auth moduleOliver Schramm2014-11-091-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13301
* | | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-11-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3119 from Elsensee/ticket/13243Marc Alexander2014-11-091-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/13243] Validate announcement entry for existence in version_helper
| | * | | | | [ticket/13243] Validate announcement entry for existence in version_helperOliver Schramm2014-11-091-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-13243
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-091-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3110 from Elsensee/ticket/13242Joas Schilling2014-11-091-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13242] Fix HTML validity
| | * | | | | [ticket/13242] Fix HTML validityOliver Schramm2014-11-051-0/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-13242
* | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-11-081-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * develop-ascraeus: [ticket/13265] Don't show link to edit own profile to those without permission