aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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 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 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 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
* | | Merge pull request #2810 from nickvergessen/ticket/12919Marc Alexander2014-08-071-10/+14
|\ \ \ | | | | | | | | | | | | [ticket/12919] Use the modules basename as identifier for extension modules
| * | | [ticket/12919] Use the modules basename as identifier for extension modulesJoas Schilling2014-08-071-10/+14
| | | | | | | | | | | | | | | | PHPBB3-12919
* | | | Merge pull request #2623 from dhruvgoel92/ticket/12738Tristan Darricau2014-08-071-14/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12738] Move related code from functions_posting to function * dhruvgoel92/ticket/12738: [ticket/12738] Update constructor docblock [ticket/12738] Add $config to constructor in notification test [ticket/12738] Fix tests with new config object injection [ticket/12738] Inject config object into content_visibility class [ticket/11528] Move related code from functions_posting to function
| * | | | [ticket/11528] Move related code from functions_posting to functionDhruv2014-06-191-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related code from functions_posting to remove_post_from_statistic() in content_visibility.php PHPBB3-11528
* | | | | Merge pull request #2812 from bantu/ticket/12826Joas Schilling2014-08-072-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12826] Add root namespace indicator to exception catching. * bantu/ticket/12826: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| * | | | | [ticket/12826] Add optional root namespace indicator for consistency.Andreas Fischer2014-08-072-2/+2
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-12826
* | | | | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-071-5/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12838] Add ACP events to acp_ranks * PayBas/ticket/12838: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| * | | | | [ticket/12838] Update RC2 to RC3PayBas2014-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | [ticket/12838] Add raw row-data to acp_ranks core eventPayBas2014-07-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | [ticket/12838] Add core events to acp_ranks.phpPayBas2014-07-101-5/+40
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-12838
* | | | | Merge pull request #2763 from brunoais/ticket/12877Marc Alexander2014-08-071-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | [ticket/12877] core.mcp_mcp_front_reports_listing_query_before
| * | | | [ticket/12877] core.mcp_mcp_front_reports_listing_query_beforebrunoais2014-07-231-0/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Adding core.mcp_mcp_front_reports_listing_query_before PHPBB3-12877
* | | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| * | | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-131-0/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-12847
* | | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-077-14/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * | | | | [ticket/12557] Fix load active module descriptionn-aleha2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix php file descriptionn-aleha2014-08-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix var $preserve_cr descriptionn-aleha2014-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
* | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-073-38/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/11148: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| * | | | | | [ticket/11148] Remove unneeded variable mimetype and use type octet-streamMarc Alexander2014-06-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $mimetype is not used in the method local_upload() afterwards so it shouldn't be assigned. The correct default mimetype should be application/octet-stream and not application/octetstream according to RFC 2046. PHPBB3-11148
| * | | | | | [ticket/11148] Always use the output of the mimetype guesser in get_mimetypeMarc Alexander2014-06-231-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
| * | | | | | [ticket/11148] Get rid of extra line in mimetype guesser setter doc blockMarc Alexander2014-06-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
| * | | | | | [ticket/11148] Add missing parts to docblock of get_mimetype() methodMarc Alexander2014-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
| * | | | | | [ticket/11148] Default to application/octet-stream if no mimetype givenMarc Alexander2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should prevent us from having an empty mimetype while uploading a file using local_upload(). PHPBB3-11148
| * | | | | | [ticket/11148] Pass mimetype guesser to upload_attachment() functionMarc Alexander2014-06-232-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
| * | | | | | [ticket/11148] Add mimetype guesser to filespec and fileupload classMarc Alexander2014-06-231-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mimetype guesser will be used to get the mimetype of uploaded files. Until now, this was only used for files uploaded with plupload. If a file doesn't have a mimetype supplied, we will now try to get the correct mimetype. PHPBB3-11148