aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-03-3132-0/+160
|\
| * Merge pull request #4264 from VSEphpbb/ticket/14570Marc Alexander2016-03-3132-0/+160
| |\
| | * [ticket/14570] Use phpbb_version_compareMatt Friedman2016-03-2932-32/+32
| | * [ticket/14570] Add effectively installed to 3.1.x versionsMatt Friedman2016-03-2932-0/+160
| * | Merge pull request #4021 from marc1706/ticket/14272Tristan Darricau2016-03-277-19/+19
| |\ \
* | | | [ticket/14572] Fix quote notification deletionGreg Ryckman2016-03-301-2/+2
* | | | [ticket/14564] Fix cookie domain calculationMáté Bartus2016-03-271-1/+8
* | | | Merge pull request #4251 from marc1706/ticket/14272-3.2.xTristan Darricau2016-03-277-19/+19
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.xMarc Alexander2016-03-277-19/+19
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/14272] Fix invalid or missing min/max settingsMarc Alexander2015-11-061-2/+2
| | * | | [ticket/14272] Only use maxlength and size for allowed input elementsMarc Alexander2015-11-067-19/+19
* | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-03-272-2/+10
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge pull request #4182 from marc1706/ticket/14481Tristan Darricau2016-03-272-2/+10
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/14481] Respect HTTP_X_FORWARDED headers for implying httpsMarc Alexander2016-02-152-2/+10
* | | | 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
| |\ \ \ \ \ \ \ \ \ \ \