aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\
| * Merge pull request #3108 from Elsensee/ticket/13284Joas Schilling2014-11-211-1/+1
| |\
| | * [ticket/13284] Set message body in topic form too, so it will be sentOliver Schramm2014-11-041-1/+1
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3068 from marc1706/ticket/13204Joas Schilling2014-11-211-1/+1
| |\ \
| | * | [ticket/13204] Tell user that password was incorrect when exceeding attemptsMarc Alexander2014-11-021-1/+1
| | |/
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-8/+32
|\ \ \ | |/ /
| * | Merge pull request #3064 from marc1706/ticket/13197Joas Schilling2014-11-211-8/+32
| |\ \
| | * | [ticket/13197] Fix tabbingMarc Alexander2014-11-091-4/+4
| | * | [ticket/13197] Correctly format sql queryMarc Alexander2014-11-091-2/+2
| | * | [ticket/13197] Also delete group avatar from users that have it setMarc Alexander2014-10-251-7/+31
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-2/+4
|\ \ \ \ | |/ / /
| * | | [ticket/13316] Ensure Recaptcha image uses https when necessary.Cesar G2014-11-211-2/+4
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3144 from marc1706/ticket/13337Joas Schilling2014-11-211-1/+1
| |\ \ \
| | * | | [ticket/13337] Allow empty array passed to sql_in_set()Marc Alexander2014-11-141-1/+1
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3023 from Nicofuma/ticket/13133Joas Schilling2014-11-211-4/+28
| |\ \ \ \
| | * | | | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | * | | | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
* | | | | | [ticket/12620] Fix functionnal testsTristan Darricau2014-11-211-1/+3
* | | | | | [ticket/12620] Fix rebaseTristan Darricau2014-11-205-103/+128
* | | | | | [ticket/12620] Add a test using a custom DI extension in an extensionTristan Darricau2014-11-201-1/+1
* | | | | | [ticket/12620] Use the container to get the environment nameTristan Darricau2014-11-203-6/+17
* | | | | | [ticket/12620] Fix testsTristan Darricau2014-11-201-0/+16
* | | | | | [ticket/12620] Creates one di extension per phpBB extensionTristan Darricau2014-11-203-90/+148
* | | | | | [ticket/12620] Adds a yaml config fileTristan Darricau2014-11-204-27/+119
* | | | | | [ticket/12620] Uses a cache directory per environmentTristan Darricau2014-11-202-15/+60
* | | | | | [ticket/12620] Add the support of the environments for the ext servicesTristan Darricau2014-11-201-3/+25
* | | | | | [ticket/12620] Use PHPBB_ENVIRONMENTTristan Darricau2014-11-201-1/+1
* | | | | | [ticket/12620] Split the environments into differents foldersTristan Darricau2014-11-201-1/+1
* | | | | | [ticket/12620] Display error message when the environment isn't availableTristan Darricau2014-11-201-1/+1
* | | | | | [ticket/12620] Allow the user to define multiples environmentsTristan Darricau2014-11-201-1/+1
* | | | | | [ticket/13063] Fix coding styleTristan Darricau2014-11-201-5/+4
* | | | | | [ticket/13063] Fix tests after rebaseTristan Darricau2014-11-201-2/+1
* | | | | | [ticket/13063] Introduces a new \phpbb\routing\router classTristan Darricau2014-11-205-181/+315
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3149 from prototech/ticket/13342Tristan Darricau2014-11-181-2/+6
| |\ \ \ \ \
| | * | | | | [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.Cesar G2014-11-161-2/+6
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-181-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/13315] Check for the includes/captcha/plugins/ directory instead.Cesar G2014-11-181-1/+1
| * | | | | | [ticket/13315] Fix loss of CAPTCHA plugin config value.Cesar G2014-11-161-1/+2
| |/ / / / /
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-11-166-30/+57
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascr...Nils Adermann2014-11-166-30/+57
| |\ \ \ \ \
| | * | | | | [ticket/13280] Output escaping for the symfony request objectTristan Darricau2014-11-166-24/+59
| | * | | | | [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"Tristan Darricau2014-11-122-12/+4
* | | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-11-161-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3136 from marc1706/ticket/13332Tristan Darricau2014-11-161-3/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | [ticket/13332] Remove useless $result assignmentMarc Alexander2014-11-111-1/+1
| | * | | | | [ticket/13332] Pass user row to passwords manager check methodMarc Alexander2014-11-111-2/+2
| | |/ / / /