aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developDhruv2015-01-111-2/+2
|\
| * Merge pull request #3176 from Senky/ticket/13346Dhruv Goel2015-01-111-2/+2
| |\ | | | | | | [ticket/13346] Fix indentation, spacing and missing divs
| | * [ticket/13346] Remove unnecessary divsJakub Senko2015-01-101-4/+1
| | | | | | | | | | | | PHPBB3-13346
| | * [ticket/13346] Fix indentation, spacing and missing divsJakub Senko2014-11-241-3/+6
| | | | | | | | | | | | PHPBB3-13346
* | | 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] Change get_global_visibility_sql()'s results
| | * | [ticket/13147] New line before comment blockbrunoais2015-01-101-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13147
| | * | [ticket/13147] Override variable name changed by requestbrunoais2015-01-101-5/+5
| | | | | | | | | | | | | | | | PHPBB3-13147
| | * | [ticket/13147] Wrong extra new linebrunoais2015-01-101-1/+0
| | | | | | | | | | | | | | | | PHPBB3-13147
| | * | [ticket/13147] Renaming content_replaced->get_global_visibility_sql_overwritebrunoais2015-01-101-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed content_replaced to get_global_visibility_sql_overwrite in order to follow the convention in other events' variables that have the same basic function PHPBB3-13147
| | * | [ticket/13147] Removing globals and using injectionbrunoais2015-01-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using globals is NG. Using a parameter instead. PHPBB3-13147
| | * | [ticket/13147] Using $phpbb_dispatcher global varbrunoais2015-01-101-1/+12
| | | | | | | | | | | | | | | | PHPBB3-13147
| | * | [ticket/13147] Allow changing the result of calling get_global_visibility_sqlbrunoais2015-01-101-0/+20
| | | | | | | | | | | | | | | | PHPBB3-13147
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-101-2/+2
|\ \ \ \ | |/ / /
| * | | [ticket/13486] Fix typo in method nameJoas Schilling2015-01-101-2/+2
| | | | | | | | | | | | | | | | PHPBB3-13486
* | | | 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 search
| | * | | [ticket/13238] Do not drop indexes that do not exist from fulltext searchJoas Schilling2014-11-282-12/+70
| | | | | | | | | | | | | | | | | | | | PHPBB3-13238
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2015-01-102-5/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php
| * | | | Merge pull request #3272 from nickvergessen/ticket/13307Marc Alexander2015-01-102-5/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/13307] Update mysql_upgrader.php to work without the schema_data...
| | * | | [ticket/13307] Update mysql_upgrader.php to work without the schema_data.phpJoas Schilling2015-01-092-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file has been delete quite some time ago. PHPBB3-13307
* | | | | 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] Wrong profile field validation options
| | * | | | [ticket/12866] Update existing profile fields with the new validationJoas Schilling2014-11-281-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12866
| | * | | | [ticket/12866] Assume underscore is part of \wJakub Senko2014-11-281-5/+5
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-12866
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-102-1/+40
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3209 from brunoais/ticket/13146Joas Schilling2015-01-102-1/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13146] Allow changing the result of calling get_forums_visibility_sql
| | * | | | [ticket/13146] Removed stray empty linebrunoais2015-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] dispatcher, not phpbb_dispatcherbrunoais2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Realign variables and descriptions in eventbrunoais2014-12-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Improved $get_forums_visibility_sql_overwrite's claritybrunoais2014-12-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] FIxed wrong order in config/content.ymlbrunoais2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Fixed variable name for the overridebrunoais2014-12-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Wrong usage of tabs in .ymlbrunoais2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Fixing what merging brokebrunoais2014-12-031-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging added content I didn't expect it to add. This fixes back to what it is supposed to be. PHPBB3-13146
| | * | | | [ticket/13146] Adding eventDispatcher to the listbrunoais2014-12-032-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] $contentReplaced -> $content_replacedbrunoais2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Extra line for claritybrunoais2014-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an extra line after the "if ($contentReplaced)" to help reading the code PHPBB3-13146
| | * | | | [ticket/13146] $phpbb_dispatcher was missingbrunoais2014-12-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added $phpbb_dispatcher to the globals list for this function. PHPBB3-13146
| | * | | | [ticket/13146] Typo on the returning variablebrunoais2014-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13147] Adding $approve_forums to the list of the event's variablesbrunoais2014-12-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13147
| | * | | | [ticket/13146] Adding $content_replaced to allow even more flexibilitybrunoais2014-12-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
| | * | | | [ticket/13146] Allow changing the result of calling get_forums_visibility_sqlbrunoais2014-12-031-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13146
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-104-10/+171
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3189 from rxu/ticket/12926Joas Schilling2015-01-104-10/+171
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12926] Support for IDN (IRI)
| | * | | | | [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.phprxu2015-01-102-34/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the $scheme and $inline vars, fix regex_idn.php to generate both common and inline mode regexes all at once. PHPBB3-12926
| | * | | | | [ticket/12926] Support for IDN (IRI)rxu2014-11-274-6/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add international domain name support for URLs. PHPBB3-12926
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-092-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3265 from tas2580/develop-ascraeusJoas Schilling2015-01-092-2/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | [ticket/13453] Sort param in Canonical URL
| | * | | | | [ticket/13453] Sort param in Canonical URLTobi Schäfer2015-01-062-2/+2
| | | | | | | | | | | | | | | | | | | | | PHPBB3-13453