aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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-263-0/+352
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Use a switch statement for readabilityMatt Friedman2016-03-211-13/+13
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Use interactive method correctlyMatt Friedman2016-03-091-30/+25
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Extract interactivity to a methodMatt Friedman2016-03-091-37/+52
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Update option helpMatt Friedman2016-03-081-1/+1
| | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-082-0/+4
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add shorthand alternates to the optionsMatt Friedman2016-03-081-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Remove whitespaceMatt Friedman2016-03-051-1/+1
| | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add an error on user creation failureMatt Friedman2016-03-051-0/+6
| | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Remove unnecessary null argumentsMatt Friedman2016-02-291-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Additional clean upMatt Friedman2016-02-291-9/+4
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Allowed to use $this in enclosureMatt Friedman2016-02-291-4/+3
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-293-3/+3
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix a few mistakes and clean it upMatt Friedman2016-02-291-8/+24
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Some code clean upMatt Friedman2016-02-291-12/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Another little fixMatt Friedman2016-02-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix testsMatt Friedman2016-02-291-3/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Update to use non-deprecated methodsMatt Friedman2016-02-292-155/+149
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add send email optionMatt Friedman2016-02-292-0/+56
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add input validationMatt Friedman2016-02-291-0/+48
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Updates for 3.2 APIMatt Friedman2016-02-293-11/+35
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix merge errorsMatt Friedman2016-02-292-0/+15
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix header fileTristan Darricau2016-02-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Fix testsTristan Darricau2016-02-291-11/+7
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add doc blocks and test file for user:addLEZY Thomas2016-02-291-1/+34
| | | | | | | | | | | | | | | | PHPBB3-12684
| * | | [ticket/12684] Add command user:addLEZY Thomas2016-02-292-0/+169
| | | | | | | | | | | | | | | | 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-261-4/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| * | | Merge pull request #3874 from lavigor/ticket/14134Tristan Darricau2016-03-261-4/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14134] Send warning notification PM in user's language. * lavigor/ticket/14134: [ticket/14134] Fix Okay in a comment. [ticket/14134] Fix code comments. [ticket/14134] Send warning notification PM in user's language.
| | * | | [ticket/14134] Fix Okay in a comment.lavigor2016-03-251-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-14134
| | * | | [ticket/14134] Fix code comments.lavigor2016-02-271-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14134
| | * | | [ticket/14134] Send warning notification PM in user's language.lavigor2015-09-021-4/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-14134
| * | | | Merge pull request #4188 from marc1706/ticket/13842Tristan Darricau2016-03-251-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13842] Prevent internal server errors without rewrite module on IIS * marc1706/ticket/13842: [ticket/13842] Prevent internal server errors without rewrite module on IIS
* | \ \ \ \ Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-253-17/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14437] Make sure attachments array is properly ordered before processing [ticket/14437] Preserve attachment ID order by ordering by attach_id [ticket/14437] Sort attachments after assigning inline attachments [ticket/14437] Correctly assume index from attachment display order
| * | | | | Merge pull request #4190 from marc1706/ticket/14437Tristan Darricau2016-03-253-17/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14437] Correctly assume index from attachment display order * marc1706/ticket/14437: [ticket/14437] Make sure attachments array is properly ordered before processing [ticket/14437] Preserve attachment ID order by ordering by attach_id [ticket/14437] Sort attachments after assigning inline attachments [ticket/14437] Correctly assume index from attachment display order
| | * | | | | [ticket/14437] Make sure attachments array is properly ordered before processingMarc Alexander2016-03-062-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14437
| | * | | | | [ticket/14437] Preserve attachment ID order by ordering by attach_idMarc Alexander2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14437
| | * | | | | [ticket/14437] Sort attachments after assigning inline attachmentsMarc Alexander2016-03-061-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not seem to cause any issues but prevents us from having to consider the currenty display order. PHPBB3-14437
| | * | | | | [ticket/14437] Correctly assume index from attachment display orderMarc Alexander2016-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14437
* | | | | | | Merge pull request #4193 from marc1706/ticket/14497Tristan Darricau2016-03-251-1/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14497] Support second app.php script in install folder * marc1706/ticket/14497: [ticket/14497] Do not check for doctype on index and use correct return [ticket/14497] Add test for visiting installer [ticket/14497] Use nginx sample config in travis tests [ticket/14497] Support second app.php script in install folder
| * | | | | | | [ticket/14497] Support second app.php script in install folderMarc Alexander2016-02-251-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14497
* | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-253-5/+32
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14241] Log fatal captcha error to error log [ticket/14241] Prevent empty q&a as a result of improper settings
| * | | | | | | Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-253-5/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14241] Prevent empty q&a as a result of improper settings * marc1706/ticket/14241: [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-122-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14241
| | * | | | | | | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-112-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #4218 from marc1706/ticket/14527Tristan Darricau2016-03-252-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14527] Retrieve link URL from href and not link text * marc1706/ticket/14527: [ticket/14527] Decode automatically generated postlink without prefix [ticket/14527] Add tests for reverted improper fix [ticket/14527] Retrieve link URL from href and not link text