aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2015-01-225-13/+199
|\
| * Merge pull request #3173 from Nicofuma/ticket/13361Nils Adermann2015-01-225-13/+199
| |\
| | * [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-212-4/+4
| | * [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| | * [ticket/13361] Add testsTristan Darricau2015-01-112-5/+11
| | * [ticket/13361] Support ajax request (send a json response)Tristan Darricau2015-01-101-9/+25
| | * [ticket/13361] Improve the exception listenerTristan Darricau2014-11-235-4/+168
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-0/+37
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-211-0/+37
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ \ \ | |/ /
| * | Merge pull request #3314 from VSEphpbb/ticket/13133Tristan Darricau2015-01-201-4/+4
| |\ \
| | * | [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #3315 from nickvergessen/ticket/13530Tristan Darricau2015-01-201-1/+1
| |\ \ \
| | * | | [ticket/13530] Fix undefined variablesJoas Schilling2015-01-201-1/+1
| * | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge pull request #3313 from nickvergessen/ticket/13528Tristan Darricau2015-01-201-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| | |/ / | |/| |
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-207-27/+141
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3293 from Nicofuma/ticket/13489Joas Schilling2015-01-207-26/+140
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/13489] Fix service configurationTristan Darricau2015-01-204-49/+41
| | * | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| | * | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-19/+19
|\ \ \ \ | |/ / /
| * | | Merge pull request #3138 from prototech/ticket/12642Joas Schilling2015-01-201-19/+19
| |\ \ \
| | * | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.Cesar G2014-11-111-19/+19
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-201-0/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-201-0/+70
| |\ \ \ \
| | * | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-201-0/+70
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-191-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13504] Fix invalid variable $userJoas Schilling2015-01-191-1/+1
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-191-0/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-191-0/+34
| |\ \ \ \ \
| | * | | | | [ticket/13192] Use ltrim() instead of preg_replace()Marc Alexander2015-01-101-1/+1
| | * | | | | [ticket/13192] Remove app.php on mod rewrite even if app.php is outside rootMarc Alexander2015-01-041-4/+7
| | * | | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-211-9/+9
| | * | | | | [ticket/13192] Add method for generating valid user page linksMarc Alexander2014-10-211-0/+31
* | | | | | | Merge pull request #3289 from MGaetan89/ticket/13450Tristan Darricau2015-01-145-0/+9
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13450] Type-hint return value of $phpbb_container->get()Gaëtan Muller2015-01-125-0/+9
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-131-1/+26
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3234 from brunoais/ticket/13154Joas Schilling2015-01-131-1/+26
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | [ticket/13154] Wrong variable name in the comment blockbrunoais2014-12-191-1/+1
| | * | | | | | [ticket/13154] space before @varbrunoais2014-12-191-1/+1
| | * | | | | | [ticket/13154] Forgot the $this->brunoais2014-12-171-1/+1
| | * | | | | | [ticket/13154] Adding phpBB dispatcher to notifications managerbrunoais2014-12-171-1/+6
| | * | | | | | [ticket/13154] Allow filtering the list of users to be notifiedbrunoais2014-12-171-0/+20
* | | | | | | | [ticket/13498] Update calls to `get_user_avatar()`Gaëtan Muller2015-01-111-6/+8
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-101-0/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3210 from brunoais/ticket/13147Joas Schilling2015-01-101-0/+29
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/13147] New line before comment blockbrunoais2015-01-101-0/+1