aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | [ticket/13370] Allow calling class method in convertor framework directly.Cesar G2014-12-091-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the usage of array($class, 'method')) directly instead of having to use the functionX syntax as follows: array('function1' => array($class, 'method'))) PHPBB3-13370
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-272-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/overall_footer.html
| * | | | | | Merge pull request #3218 from rxu/ticket/13419Joas Schilling2014-12-273-0/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13419] Add the lowermost template event
| | * | | | | | [ticket/13419] Add the lowermost template eventrxu2014-12-063-0/+12
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-13419
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3216 from kinerity/ticket/13409Joas Schilling2014-12-271-0/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13409] Add event core.search_modify_param_before
| | * | | | | | [ticket/13409] Change search_id type and release versionKailey Truscott2014-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13409
| | * | | | | | [ticket/13409] Fix event nameKailey Truscott2014-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13409
| | * | | | | | [ticket/13409] Add event core.search_modify_param_beforeKailey Truscott2014-12-041-0/+20
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13409
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3214 from brunoais/ticket/13159Joas Schilling2014-12-271-0/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13159] Allow to do extra auth checks on report posting
| | * | | | | | [ticket/13159] Allow to do extra auth checks on report postingbrunoais2014-12-031-0/+18
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13159
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3205 from rxu/ticket/13406Joas Schilling2014-12-271-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13406] Add a space between the index name and columns list
| | * | | | | | [ticket/13406] Add a space between the index name and columns listrxu2014-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's no space between the index name and columns list when generating ADD INDEX sql query for MySQL DBMSes. This may cause errors on earlier MySQL versions like 3.23. PHPBB3-13406
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-49/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3202 from Nicofuma/ticket/13402Joas Schilling2014-12-271-49/+69
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13402] Code sniffer, unused use, check the function doc blocks
| | * | | | | | | [ticket/13402] Handle arrays and multiples typesTristan Darricau2014-11-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13402
| | * | | | | | | [ticket/13402] Refactor unused use SniffTristan Darricau2014-11-301-79/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13402
| | * | | | | | | [ticket/13402] Code sniffer, unused use, check the function doc blocksTristan Darricau2014-11-291-0/+62
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13402
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-20/+53
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3191 from Elsensee/ticket/13312Joas Schilling2014-12-271-20/+53
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13312] Add event core.acp_email_send_before
| | * | | | | | | [ticket/13312] Use empty for usernames arrayOliver Schramm2014-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13312
| | * | | | | | | [ticket/13312] Add event core.acp_email_send_beforeOliver Schramm2014-11-261-19/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13312
* | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3175 from Senky/ticket/13368Joas Schilling2014-12-271-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data event
| | * | | | | | | | [ticket/13368] Update versionJakub Senko2014-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13368
| | * | | | | | | | [ticket/13368] Add @changed entryJakub Senko2014-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13368
| | * | | | | | | | [ticket/13368] Add $forum_data to viewforum_get_topic_ids_data eventJakub Senko2014-11-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13368
* | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3168 from Senky/ticket/11033Joas Schilling2014-12-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11033] FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
| | * | | | | | | | | [ticket/11033] Update string to reflect real requirementsJakub Senko2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11033
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-274-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/index.htm phpBB/styles/subsilver2/template/overall_header.html phpBB/styles/subsilver2/template/simple_header.html phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html phpBB/styles/subsilver2/template/viewtopic_print.html phpBB/styles/subsilver2/theme/images/index.htm
| * | | | | | | | | | Merge pull request #3167 from Senky/ticket/12924Joas Schilling2014-12-2710-12/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12924] Make meta tags self-closing
| | * | | | | | | | | | [ticket/12924] Remove newlines at the EOFJakub Senko2014-11-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12924
| | * | | | | | | | | | [ticket/12924] Make meta tags self-closingJakub Senko2014-11-2210-14/+14
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12924
* | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3099 from Senky/ticket/13266Joas Schilling2014-12-271-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined
* | \ \ \ \ \ \ \ \ \ \ Merge pull request #3170 from Nicofuma/ticket/13266-developJoas Schilling2014-12-274-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13266-develop] Enable twig dump function
| * | | | | | | | | | | | [ticket/13266] Enable the debug extension in the development environmentTristan Darricau2014-11-224-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13266
| * | | | | | | | | | | | [ticket/13266] Merge pull request #3099 from Senky/ticket/13266Tristan Darricau2014-11-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined * Senky/ticket/13266: [ticket/13266] Enable twig dump function Conflicts: phpBB/phpbb/template/twig/twig.php PHPBB3-13266
| | * | | | | | | | | | | [ticket/13266] Enable twig dump functionJakub Senko2014-11-011-0/+5
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13266
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-12-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3159 from Crizz0/ticket/13357Joas Schilling2014-12-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entries
| | * | | | | | | | | | [ticket/13357] Adds missing LOG_MOVED_TOPIC for 3.0.12 left-over entriesCrizzo2014-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13357
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12567] wrap to top
| * | | | | | | | | | | Merge remote-tracking branch 'Senky/ticket/12567' into develop-ascraeusCesar G2014-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/12567: [ticket/12567] wrap to top
| | * | | | | | | | | | | [ticket/12567] wrap to topJakub Senko2014-11-221-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12567
* | | | | | | | | | | | Merge branch 'develop-ascraeus' into developCesar G2014-12-091-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13319] Add missing table tags
| * | | | | | | | | | | Merge remote-tracking branch 'Senky/ticket/13319' into develop-ascraeusCesar G2014-12-091-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/13319: [ticket/13319] Add missing table tags