aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | [ticket/14640] Changes link from 3.3 to 3.2 to link to the correct docuCrizzo2016-05-181-1/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-14640
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-06-191-0/+10
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: phpBB/language/en/install.php
| * | [ticket/13716] Remove extra br tag and correct missing closing a html tagRichard McGirr2016-05-161-1/+1
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Fix verbosenessRichard McGirr2016-04-121-17/+1
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Fix grammar and href title tagsRichard McGirr2016-04-061-7/+7
| | | | | | | | | | | | PHPBB3-13716
| * | [ticket/13716] Check phpBB version against config versionRichard McGirr2016-04-051-0/+25
| |/ | | | | | | | | | | | | | | Display a warning in the ACP if the version constant (files) does not match the phpbb_config version (often indicating that the database updates hasn't been run) PHPBB3-13716
* | [ticket/13969] Remove obsolute language filesPaul Sohier2016-04-282-470/+0
| | | | | | | | | | | | These help_*.php files have been moved to help/ PHPBB3-13969
* | [ticket/14589] Fix grammatical errors in language stringsMáté Bartus2016-04-111-6/+6
| | | | | | | | PHPBB3-14589
* | [ticket/14589] Add error messages for failable installer requirementsMáté Bartus2016-04-101-9/+13
| | | | | | | | PHPBB3-14589
* | Merge pull request #4248 from VSEphpbb/ticket/14561Tristan Darricau2016-04-031-0/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14561] Add more user commands * VSEphpbb/ticket/14561: [ticket/14561] Remove requires for functions in tests [ticket/14561] Small change to progress bar output [ticket/14561] Fix function docblock in activate command [ticket/14561] Add a progress bar to reclean command [ticket/14561] Use the user loader where appropriate [ticket/14561] Add extra help explaining reclean command [ticket/14561] Import classes with use statements [ticket/14561] Remove unused use statements [ticket/14561] Refactor tests [ticket/14561] Reclean usernames command [ticket/14561] User activate command [ticket/14561] User delete command
| * | [ticket/14561] Add a progress bar to reclean commandMatt Friedman2016-03-311-1/+2
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] Add extra help explaining reclean commandMatt Friedman2016-03-311-0/+1
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] Reclean usernames commandMatt Friedman2016-03-311-0/+6
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] User activate commandMatt Friedman2016-03-311-0/+7
| | | | | | | | | | | | PHPBB3-14561
| * | [ticket/14561] User delete commandMatt Friedman2016-03-311-0/+4
| | | | | | | | | | | | PHPBB3-14561
* | | [ticket/14495] Specify correct version numbers in 3.2.xMarc Alexander2016-04-021-1/+1
|/ / | | | | | | | | | | | | | | DO NOT apply these changes into master when merging it. This means that you'll have to checkout the latest files from upstream after merging this into master (possibly while resolving likely merge conflicts). PHPBB3-14495
* | [ticket/14329] Add missing ACP language varsRichard McGirr2016-03-271-0/+10
| | | | | | | | PHPBB3-14329
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-271-1/+1
|\ \ | |/
| * Merge pull request #4230 from Senky/ticket/13028Marc Alexander2016-03-271-1/+1
| |\ | | | | | | | | | [ticket/13028] Rename unanswered search label
| | * [ticket/13028] Rename unanswered search labelJakub Senko2016-03-181-1/+1
| | | | | | | | | | | | PHPBB3-13028
* | | Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-261-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12684] Add console command user:add * VSEphpbb/ticket/12684: (26 commits) [ticket/12684] Use a switch statement for readability [ticket/12684] Refactor a test [ticket/12684] Use interactive method correctly [ticket/12684] Extract interactivity to a method [ticket/12684] Update option help [ticket/12684] Add extended help for the user:add command [ticket/12684] Add shorthand alternates to the options [ticket/12684] Remove whitespace [ticket/12684] Add an error on user creation failure [ticket/12684] Remove unnecessary null arguments [ticket/12684] Additional clean up [ticket/12684] Allowed to use $this in enclosure [ticket/12684] Move all lang keys to cli [ticket/12684] Fix a few mistakes and clean it up [ticket/12684] Some code clean up [ticket/12684] Another little fix [ticket/12684] Fix tests [ticket/12684] Update to use non-deprecated methods [ticket/12684] Add send email option [ticket/12684] Add input validation ...
| * | | [ticket/12684] Update option helpMatt Friedman2016-03-081-1/+1
| | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-081-0/+3
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-292-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add send email optionMatt Friedman2016-02-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Updates for 3.2 APIMatt Friedman2016-02-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix merge errorsMatt Friedman2016-02-291-0/+5
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add command user:addLEZY Thomas2016-02-291-0/+2
| | | | | | | | | | | | | | | | PHPBB3-12684
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-261-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/13013] Explain to user explicitl what "participate more" means
| * | | [ticket/13013] Explain to user explicitl what "participate more" meansJakub Senko2016-03-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13013
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-252-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * | | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-121-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14241
| * | | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improper setup of the q&a captcha in combination with the admin choosing a default language that does not have any questions and answers set might result in the user being presented empty questions and answers. This change will try to fall back to any question in case the admin incorrectly set the default language and has no questions & answers set. If that does not work, the captcha will not allow passing it and suggest to contact the board admin to resolve this issue. PHPBB3-14241
* | | Merge branch '3.2.x'Marc Alexander2016-03-051-1/+1
|\ \ \
| * \ \ Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-051-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/14508] Adjust account inactive languageRichard McGirr2016-03-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14508
| | * | [ticket/14508] Change language notice on account activationRichard McGirr2016-03-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14508
* | | | Merge branch '3.2.x'Marc Alexander2016-02-291-2/+2
|\ \ \ \ | |/ / /
| * | | [ticket/14499] Fix wording and commentsTristan Darricau2016-02-291-0/+1
| | | | | | | | | | | | | | | | PHPBB3-14499
| * | | [ticket/14499] Add command to update the board from CLITristan Darricau2016-02-251-2/+1
| | |/ | |/| | | | | | | PHPBB3-14499
* | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-1/+1
|/ / | | | | | | PHPBB3-14495
* | Merge pull request #4171 from CHItA/ticket/14462Tristan Darricau2016-02-161-4/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14462] Try to prevent timeouts in the installer * CHItA/ticket/14462: [ticket/14462] Not show timeout messages in convertors [ticket/14462] Make timeout error translateable [ticket/14462] Update ordering in install db config [ticket/14462] Fix comments [ticket/14462] Fix tests [ticket/14462] Fix CS and typo [ticket/14462] Set instance of db driver for database access using global [ticket/14462] Fix installation in tests [ticket/14462] Refactor tasks to be more modular [ticket/14462] Further speed improvements
| * | [ticket/14462] Make timeout error translateableOliver Schramm2016-02-141-1/+5
| | | | | | | | | | | | PHPBB3-14462
| * | [ticket/14462] Further speed improvementsMate Bartus2016-02-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Cache the secondary container - Only initialize tasks/modules that are being used - Add timeout error message in the AJAX UI PHPBB3-14462
* | | Merge pull request #4159 from marc1706/ticket/14448Tristan Darricau2016-02-111-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14448] Use guzzle for remote files uploading * marc1706/ticket/14448: [ticket/14448] Correctly pass verify setting if available [ticket/14448] Let user decide if remote upload certs should be checked [ticket/14448] Add new vendor files and dirs to clean task [ticket/14448] Do not try to test remote upload timeout [ticket/14448] Remove no longer needed guzzle 3.9.3 [ticket/14448] Use GuzzleHttp and try to verify certs [ticket/14448] Update composer.json and lock file for guzzlehttp [ticket/14431] Remote avatar uploading [ticket/14431] Remote avatar uploading
| * | | [ticket/14448] Let user decide if remote upload certs should be checkedMarc Alexander2016-02-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues like coding style. PHPBB3-14448
* | | | [ticket/14307] Fixes wording in install.php file/dir exist/writeableCrizzo2016-02-061-4/+4
| |/ / |/| | | | | | | | PHPBB3-14307
* | | [prep-release-3.2.0-b1] Update language help filesTristan Darricau2016-02-031-2/+2
|/ /
* | Merge pull request #4017 from CHItA/ticket/14262Tristan Darricau2016-02-021-0/+109
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14262] Move convertor to controller * CHItA/ticket/14262: [ticket/14262] Add error handling and small CS fixes [ticket/14262] Remove converter template duplicate [ticket/14262] Fix stage navigation [ticket/14262] Move convertor to controller
| * | [ticket/14262] Move convertor to controllerMate Bartus2016-01-291-0/+109
| | | | | | | | | | | | PHPBB3-14262