aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/14393] Fix init for conflict archiveMáté Bartus2016-03-271-7/+6
* [ticket/14393] Fix updater behaviourMáté Bartus2016-03-273-4/+9
* Merge pull request #4199 from VSEphpbb/ticket/12684Tristan Darricau2016-03-261-0/+328
|\
| * [ticket/12684] Use a switch statement for readabilityMatt Friedman2016-03-211-13/+13
| * [ticket/12684] Use interactive method correctlyMatt Friedman2016-03-091-30/+25
| * [ticket/12684] Extract interactivity to a methodMatt Friedman2016-03-091-37/+52
| * [ticket/12684] Add extended help for the user:add commandMatt Friedman2016-03-081-0/+1
| * [ticket/12684] Add shorthand alternates to the optionsMatt Friedman2016-03-081-3/+3
| * [ticket/12684] Remove whitespaceMatt Friedman2016-03-051-1/+1
| * [ticket/12684] Add an error on user creation failureMatt Friedman2016-03-051-0/+6
| * [ticket/12684] Remove unnecessary null argumentsMatt Friedman2016-02-291-2/+2
| * [ticket/12684] Additional clean upMatt Friedman2016-02-291-9/+4
| * [ticket/12684] Allowed to use $this in enclosureMatt Friedman2016-02-291-4/+3
| * [ticket/12684] Move all lang keys to cliMatt Friedman2016-02-291-1/+1
| * [ticket/12684] Fix a few mistakes and clean it upMatt Friedman2016-02-291-8/+24
| * [ticket/12684] Some code clean upMatt Friedman2016-02-291-12/+1
| * [ticket/12684] Another little fixMatt Friedman2016-02-291-1/+1
| * [ticket/12684] Fix testsMatt Friedman2016-02-291-3/+1
| * [ticket/12684] Update to use non-deprecated methodsMatt Friedman2016-02-291-143/+136
| * [ticket/12684] Add send email optionMatt Friedman2016-02-291-0/+55
| * [ticket/12684] Add input validationMatt Friedman2016-02-291-0/+48
| * [ticket/12684] Updates for 3.2 APIMatt Friedman2016-02-291-10/+32
| * [ticket/12684] Fix header fileTristan Darricau2016-02-291-1/+1
| * [ticket/12684] Fix testsTristan Darricau2016-02-291-11/+7
| * [ticket/12684] Add doc blocks and test file for user:addLEZY Thomas2016-02-291-1/+34
| * [ticket/12684] Add command user:addLEZY Thomas2016-02-291-0/+167
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-251-4/+30
|\ \
| * \ Merge pull request #4214 from marc1706/ticket/14241Tristan Darricau2016-03-251-4/+30
| |\ \
| | * | [ticket/14241] Log fatal captcha error to error logMarc Alexander2016-03-121-4/+8
| | * | [ticket/14241] Prevent empty q&a as a result of improper settingsMarc Alexander2016-03-111-2/+24
| * | | Merge pull request #4242 from marc1706/ticket/14136Tristan Darricau2016-03-241-0/+1
| |\ \ \
* | \ \ \ Merge pull request #4245 from JoshyPHP/ticket/14381Tristan Darricau2016-03-252-2/+3
|\ \ \ \ \
| * | | | | [ticket/14381] Set the mode in message parser to "reparse"JoshyPHP2016-03-241-1/+2
| * | | | | Merge branch '3.2.x'Tristan Darricau2016-03-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '3.2.x'Máté Bartus2016-03-082-3/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-071-8/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '3.2.x'Tristan Darricau2016-03-021-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-03-014-2/+142
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-299-21/+479
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '3.2.x'Marc Alexander2016-02-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | [ticket/14495] Updates the version to 3.3.0-a1-devTristan Darricau2016-02-241-1/+1
* | | | | | | | | | | | | Merge pull request #4237 from Nicofuma/ticket/14555Marc Alexander2016-03-245-33/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [ticket/14555] Uniformize cache directory usagesTristan Darricau2016-03-245-33/+26
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4243 from marc1706/ticket/14136-3.2.xTristan Darricau2016-03-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ticket/14136' into ticket/14136-3.2.xMarc Alexander2016-03-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | [ticket/14136] Add back X-UA-Compatible meta tagMarc Alexander2016-03-241-0/+1
* | | | | | | | | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #4222 from marc1706/ticket/14536Tristan Darricau2016-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | [ticket/14536] Force unix time stamps to be integerMarc Alexander2016-03-231-1/+1