aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | [ticket/13147] Override variable name changed by requestbrunoais2015-01-101-5/+5
| | * | | [ticket/13147] Wrong extra new linebrunoais2015-01-101-1/+0
| | * | | [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwritebrunoais2015-01-101-10/+10
| | * | | [ticket/13147] Removing globals and using injectionbrunoais2015-01-101-3/+1
| | * | | [ticket/13147] Using $phpbb_dispatcher global varbrunoais2015-01-101-1/+12
| | * | | [ticket/13147] Allow changing the result of calling get_global_visibility_sqlbrunoais2015-01-101-0/+20
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-101-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/13486] Fix typo in method nameJoas Schilling2015-01-101-2/+2
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-102-12/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3195 from nickvergessen/ticket/13238-ascMarc Alexander2015-01-102-12/+70
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/13238] Do not drop indexes that do not exist from fulltext searchJoas Schilling2014-11-282-12/+70
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-102-5/+52
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3166 from nickvergessen/Senky-ticket/12866Marc Alexander2015-01-102-5/+52
| |\ \ \ \
| | * | | | [ticket/12866] Update existing profile fields with the new validationJoas Schilling2014-11-281-0/+47
| | * | | | [ticket/12866] Assume underscore is part of \wJakub Senko2014-11-281-5/+5
| | |/ / /
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-101-1/+39
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3209 from brunoais/ticket/13146Joas Schilling2015-01-101-1/+39
| |\ \ \ \
| | * | | | [ticket/13146] Removed stray empty linebrunoais2015-01-101-1/+0
| | * | | | [ticket/13146] Realign variables and descriptions in eventbrunoais2014-12-291-5/+5
| | * | | | [ticket/13146] Improved $get_forums_visibility_sql_overwrite's claritybrunoais2014-12-291-2/+4
| | * | | | [ticket/13146] Fixed variable name for the overridebrunoais2014-12-031-5/+5
| | * | | | [ticket/13146] Fixing what merging brokebrunoais2014-12-031-4/+2
| | * | | | [ticket/13146] Adding eventDispatcher to the listbrunoais2014-12-031-1/+9
| | * | | | [ticket/13146] $contentReplaced -> $content_replacedbrunoais2014-12-031-1/+1
| | * | | | [ticket/13146] Extra line for claritybrunoais2014-12-031-0/+1
| | * | | | [ticket/13146] $phpbb_dispatcher was missingbrunoais2014-12-031-0/+2