aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-141-4/+4
|\ | | | | | | | | | | | | * develop-ascraeus: [ticket/13019] Do not hide reason field when deleting permanently. [ticket/13019] Rename deletion reason label. [ticket/13019] Always accept a reason for deleting a post/topic.
| * [ticket/13019] Always accept a reason for deleting a post/topic.Cesar G2014-09-141-4/+4
| | | | | | | | PHPBB3-13019
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-121-1/+1
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php
| * [ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.phpTristan Darricau2014-09-111-1/+1
| | | | | | | | PHPBB3-13057
* | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-3/+27
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13005] Add event to display_forums() to modify category template data
| * Merge pull request #2901 from rxu/ticket/13005Tristan Darricau2014-09-111-3/+27
| |\ | | | | | | | | | | | | | | | | | | [ticket/13005] Add event to display_forums() to modify category template data * rxu/ticket/13005: [ticket/13005] Add event to display_forums() to modify category template data
| | * [ticket/13005] Add event to display_forums() to modify category template datarxu2014-08-221-3/+27
| | | | | | | | | | | | | | | | | | | | | While there're events to modify/add FORUM_POST/FORUM_LINK template data, such an event is missing for FORUM_CAT forum type. PHPBB3-13005
* | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-111-1/+5
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
| * | Merge pull request #2903 from rxu/ticket/13006Tristan Darricau2014-09-111-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event * rxu/ticket/13006: [ticket/13006] Add variables to the 'core.modify_quickmod_actions' event
| | * | [ticket/13006] Add variables to the 'core.modify_quickmod_actions' eventrxu2014-08-221-1/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | Add $quickmod and $action variables for the 'core.modify_quickmod_actions' event trigerring to avoid of using global operator in corresponding extensions. PHPBB3-13006
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-101-2/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13042] Remove unused variables
| * | Merge pull request #2940 from Senky/ticket/13042Andreas Fischer2014-09-101-2/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13042] Unused var in login_box() * Senky/ticket/13042: [ticket/13042] Remove unused variables
| | * | [ticket/13042] Remove unused variablesJakub Senko2014-09-101-2/+0
| | | | | | | | | | | | | | | | PHPBB3-13042
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-101-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12976] Correctly use plurals for attachment count in UCP navigation Conflicts: phpBB/styles/subsilver2/template/ucp_attachments.html
| * | | Merge pull request #2936 from nickvergessen/ticket/12976Tristan Darricau2014-09-101-0/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | [ticket/12976] Correctly use plurals for attachment count in UCP navigation * nickvergessen/ticket/12976: [ticket/12976] Correctly use plurals for attachment count in UCP navigation
| | * | [ticket/12976] Correctly use plurals for attachment count in UCP navigationJoas Schilling2014-09-091-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12976
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-101-4/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Restore timespan parameter for check_form_key()
| * | | [ticket/13052] Restore timespan parameter for check_form_key()Joas Schilling2014-09-101-4/+9
| | | | | | | | | | | | | | | | PHPBB3-13052
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-092-22/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13052] Use request class instead of $_POST and request_var() [ticket/13052] Fix appearances with multiple parameters [ticket/13052] Remove additional parameter from check_form_key()
| * | | [ticket/13052] Use request class instead of $_POST and request_var()Joas Schilling2014-09-091-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13052
| * | | [ticket/13052] Fix appearances with multiple parametersJoas Schilling2014-09-091-1/+5
| | | | | | | | | | | | | | | | PHPBB3-13052
| * | | [ticket/13052] Remove additional parameter from check_form_key()Joas Schilling2014-09-091-17/+9
| |/ / | | | | | | | | | PHPBB3-13052
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-6/+18
|\ \ \ | |/ /
| * | Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-6/+18
| |\ \ | | | | | | | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| | * | [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-6/+18
| | | | | | | | | | | | | | | | PHPBB3-12983
* | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | | Merge pull request #2918 from marc1706/ticket/13031Tristan Darricau2014-09-061-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13031] Only use mimetype guesser guess if it helps us * marc1706/ticket/13031: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| | * | | [ticket/13031] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13031
| | * | | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-1/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-051-142/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
| |\ \ \ | | |/ / | |/| | | | | | [ticket/12765] Use db_tools instead of generating queries at moment
| | * | [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | | | | | | | | | | | | | | | PHPBB3-12765
| | * | [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
| | | | | | | | | | | | | | | | PHPBB3-12765
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-301-0/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| | * | | [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12928
| | * | | [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-08-297-18/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12966] Sort by post_time and post_id where applicable [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-297-18/+27
| |\ \ \ \ | | | | | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| | * | | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-237-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-08-241-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
| * | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblockMarc Alexander2014-08-241-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-13010
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-214-19/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12999] Remove @author tags
| * | | | Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags
| | * | | | [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12999
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2112-86/+86
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2112-86/+86
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| | * | | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
| | * | | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1612-87/+87
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-201-2/+2
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:28:48 +0000