aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-101-10/+2
|\
| * Merge pull request #2864 from rxu/ticket/12931Marc Alexander2014-08-101-10/+2
| |\ | | | | | | | | | [ticket/12931] Fix general error on user registration
| | * [ticket/12931] Fix general error on user registrationrxu2014-08-101-10/+2
| | | | | | | | | | | | | | | | | | | | | Fix "Illegal use of $_SERVER" general error on user registration when $config['server_name'] is not set. PHPBB3-12931
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-101-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding Conflicts: phpBB/config/services.yml
| * | Merge pull request #2862 from marc1706/ticket/12932Joas Schilling2014-08-101-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | [ticket/12932] Add method for allowing override of \phpbb\datetime class * marc1706/ticket/12932: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding
| | * [ticket/12932] Fix tests and calls to create_datetimeMarc Alexander2014-08-101-2/+2
| | | | | | | | | | | | PHPBB3-12932
| | * [ticket/12932] Add method for getting the datetime class and allow overridingMarc Alexander2014-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | An extension can now override the datetime class by overwriting the datetime.class parameter in their own yml file. PHPBB3-12932
* | | Merge branch 'develop-ascraeus' into developDhruv2014-08-102-16/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | # By omniError # Via Dhruv Goel (1) and omniError (1) * develop-ascraeus: [ticket/12831] fix CS [ticket/12831] simplified code, upd event block [ticket/12831] reimplemented headers as array [ticket/12831] Optn to prevent setting HTTP headers
| * | Merge pull request #2730 from omniError/ticket/12831Dhruv Goel2014-08-102-16/+42
| |\ \ | | |/ | |/| [ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
| | * [ticket/12831] fix CSomniError2014-08-092-3/+3
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * [ticket/12831] simplified code, upd event blockomniError2014-08-092-12/+6
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * [ticket/12831] reimplemented headers as arrayomniError2014-08-092-29/+33
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| | * [ticket/12831] Optn to prevent setting HTTP headersomniError2014-08-012-15/+43
| | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-102-3/+15
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12943] Add core.phpbb_generate_debug_output core event
| * | Merge pull request #2846 from rxu/ticket/12943Joas Schilling2014-08-102-3/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12943] Add core.phpbb_generate_debug_output core event * rxu/ticket/12943: [ticket/12943] Add core.phpbb_generate_debug_output core event
| | * | [ticket/12943] Add core.phpbb_generate_debug_output core eventrxu2014-08-092-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.phpbb_generate_debug_output core event to allow extensions outputting additional debug info. PHPBB3-12943
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-103-66/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | Merge pull request #2852 from bantu/ticket/12938Joas Schilling2014-08-103-66/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| | * | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-093-66/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12938
* | | | | [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-102-4/+37
| | | | | | | | | | | | | | | | | | | | PHPBB3-12957
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-101-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
| * | | | Merge pull request #2849 from bantu/ticket/12941Tristan Darricau2014-08-101-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12941] Check for Sami parse errors on Travis CI. * bantu/ticket/12941: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
| | * | | | [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-0/+2
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-12941
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-091-12/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| * | | | Merge pull request #2624 from dhruvgoel92/ticket/12718Tristan Darricau2014-08-091-12/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12718] Use remove_topic_from_statistic() for delete_topic * dhruvgoel92/ticket/12718: [ticket/12718] Use a separate variable for sql query [ticket/12718] Fix spacing and type casting [ticket/12718] Fix docblocks [ticket/12718] Add tests to check user_posts on post deletion [ticket/12718] Update docblock [ticket/12718] Use remove_topic_from_statistic() for delete_topic
| | * | | [ticket/12718] Use remove_topic_from_statistic() for delete_topicDhruv2014-08-071-12/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12718
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-091-2/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2833 from Geolim4/ticket/11520Marc Alexander2014-08-091-2/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11520] Re-adjust userpost count on topic fork
| | * | | | [ticket/11520] Re-adjust userpost count on topic forkGeolim42014-08-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11520
| | * | | | [ticket/11520] Coding guideline complianceGeolim42014-08-081-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11520
| | * | | | [ticket/11520] Re-adjust userpost count on topic forkGeolim42014-08-081-2/+28
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-11520
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-091-0/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12841] Make config position default to after [ticket/12841] Update comments in tests making after default [ticket/12841] prefix function name with phpbb_ [ticket/12841] Add a tests for the new function [ticket/12841] Fix white space issues reported by sniffer [ticket/12841] Allow extensions to position new config vars
| * | | | Merge pull request #2724 from VSEphpbb/ticket/12841Joas Schilling2014-08-091-0/+27
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12841] Allow extensions to position new config vars * VSEphpbb/ticket/12841: [ticket/12841] Make config position default to after [ticket/12841] Update comments in tests making after default [ticket/12841] prefix function name with phpbb_ [ticket/12841] Add a tests for the new function [ticket/12841] Fix white space issues reported by sniffer [ticket/12841] Allow extensions to position new config vars
| | * | | [ticket/12841] Make config position default to afterMatt Friedman2014-07-281-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12841
| | * | | [ticket/12841] prefix function name with phpbb_Matt Friedman2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12841
| | * | | [ticket/12841] Fix white space issues reported by snifferMatt Friedman2014-07-111-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12841
| | * | | [ticket/12841] Allow extensions to position new config varsMatt Friedman2014-07-111-0/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-12841
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-081-1/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/10404] Fix codesniffer complaint about anonymous function [ticket/10404] Use anonymous function instead of create_function in acp/auth
| * | | | Merge pull request #2832 from marc1706/ticket/10404Andreas Fischer2014-08-081-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10404] Use anonymous function instead of create_function in acp/auth * marc1706/ticket/10404: [ticket/10404] Fix codesniffer complaint about anonymous function [ticket/10404] Use anonymous function instead of create_function in acp/auth
| | * | | | [ticket/10404] Fix codesniffer complaint about anonymous functionMarc Alexander2014-08-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10404
| | * | | | [ticket/10404] Use anonymous function instead of create_function in acp/authMarc Alexander2014-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10404
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-081-0/+23
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12927] core.mcp_queue_get_posts2_query_before
| * | | | | Merge pull request #2824 from brunoais/ticket/12927Joas Schilling2014-08-081-0/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12927] core.mcp_queue_get_posts2_query_before * brunoais/ticket/12927: [ticket/12927] core.mcp_queue_get_posts2_query_before
| | * | | | | [ticket/12927] core.mcp_queue_get_posts2_query_beforebrunoais2014-08-081-0/+23
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_queue_get_posts2_query_before event to mcp backend. PHPBB3-12927
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-081-0/+23
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12880] core.mcp_queue_!is_topics_query_before
| * | | | | Merge pull request #2764 from brunoais/ticket/12880Joas Schilling2014-08-081-0/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12880] core.mcp_queue_!is_topics_query_before * brunoais/ticket/12880: [ticket/12880] core.mcp_queue_!is_topics_query_before
| | * | | | | [ticket/12880] core.mcp_queue_!is_topics_query_beforebrunoais2014-08-071-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core.mcp_queue_is_topics_query_before PHPBB3-12880
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-081-0/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
| * | | | | | Merge pull request #2762 from brunoais/ticket/12876Joas Schilling2014-08-081-0/+14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after * brunoais/ticket/12876: [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_after
| | * | | | | [ticket/12876] core.mcp_mcp_front.mcp_front_view_queue_postid_list_afterbrunoais2014-08-071-0/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_mcp_front.mcp_front_view_queue_topicid_list_after event to mcp backend. PHPBB3-12876