aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-041-2/+43
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/mcp_post.html
| * Merge pull request #3558 from javiexin/ticket/13786Joas Schilling2015-06-041-2/+43
| |\ | | | | | | | | | [ticket/13786] Add events to add MCP post options
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix another typo. PHPBB3-13786
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html Fix typo. PHPBB3-13786
| | * [ticket/13786] Add events to add MCP post optionsjaviexin2015-04-271-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | Three new events are included: 1) Core event to perform new moderator action in includes/mcp/mcp_post.php 2) Core event to add/modify template data in includes/mcp/mcp_post.php 3) Template event to present new options in template/mcp_post.html PHPBB3-13786
* | | Merge branch '3.1.x'Joas Schilling2015-05-281-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| * | Merge pull request #3469 from brunoais/ticket/13672Joas Schilling2015-05-281-0/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13672] Allow changing the data from the user-submitted report * brunoais/ticket/13672: [ticket/13672] Removed bogus sting concatenation [ticket/13672] BUMP version to 3.1.5-dev [ticket/13672] Allow changing the data from the user-submitted report
| | * | [ticket/13672] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13672
| | * | [ticket/13672] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13672
| | * | [ticket/13672] Allow changing the data from the user-submitted reportbrunoais2015-03-051-0/+20
| | | | | | | | | | | | | | | | PHPBB3-13672
* | | | Merge branch '3.1.x'Joas Schilling2015-05-281-5/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query Conflicts: phpBB/includes/mcp/mcp_reports.php
| * | | Merge pull request #3468 from brunoais/ticket/13668Joas Schilling2015-05-281-5/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13668] Allow changing the query to obtain the user-submitted report * brunoais/ticket/13668: [ticket/13668] Removed bogus sting concatenation [ticket/13668] BUMP version to 3.1.5-dev [ticket/13668] Allow changing the query to obtain the user-submitted report. [ticket/13668] Convert the mcp report_details query to a built query
| | * | | [ticket/13668] Removed bogus sting concatenationbrunoais2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | [ticket/13668] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13668
| | * | | [ticket/13668] Allow changing the query to obtain the user-submitted report.brunoais2015-03-051-0/+19
| | |/ / | | | | | | | | | | | | PHPBB3-13668
| | * | [ticket/13668] Convert the mcp report_details query to a built querybrunoais2015-03-051-5/+14
| | | | | | | | | | | | | | | | PHPBB3-13668
* | | | Merge branch '3.1.x'Marc Alexander2015-05-081-4/+21
|\ \ \ \ | |/ / /
| * | | Merge pull request #3459 from brunoais/ticket/13664Marc Alexander2015-05-081-4/+21
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13664] Add event to allow changing number of unapproved posts in mcp_front
| | * | | [ticket/13664] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | [ticket/13664] Added alias to table to make modding easier.brunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | [ticket/13664] Add event to allow changing number of unapproved posts listedbrunoais2015-03-011-0/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13664
| | * | | [ticket/13664] From string query in mcp_front unapproved posts to built querybrunoais2015-03-011-4/+9
| | |/ / | | | | | | | | | | | | PHPBB3-13664
* | | | Merge branch '3.1.x'Marc Alexander2015-05-081-0/+12
|\ \ \ \ | |/ / /
| * | | Merge pull request #3455 from brunoais/ticket/13660Marc Alexander2015-05-081-0/+12
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13660] Allow changing the query for total reports in mcp_front
| | * | | [ticket/13660] BUMP version to 3.1.5-RC1brunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| | * | | [ticket/13660] Fix @since version.brunoais2015-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13660
| | * | | [ticket/13660] Allow changing the query for total reports in mcp_frontbrunoais2015-02-281-0/+12
| | |/ / | | | | | | | | | | | | PHPBB3-13660
* | | | Merge branch '3.1.x'Andreas Fischer2015-05-061-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13819] Add missing sql_freeresult() to files in includes/ Conflicts: phpBB/includes/acp/acp_database.php
| * | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-051-0/+1
| | | | | | | | | | | | | | | | PHPBB3-13819
* | | | [ticket/13654] Moving reporting into controllerMateBartus2015-04-161-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving report.php's content into different services and controllers to better comply with the MVC model. Also implementing: * Replacement for reasons_display() * Adding assign_meta_refresh_var() to \controller\helper * Adding separate routes for easy configuration * Updating unit tests to expect to correct results * Add BC tests PHPBB3-13654
* | | | Merge branch '3.1.x'Joas Schilling2015-04-061-0/+25
|\ \ \ \ | |/ / /
| * | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
| |\ \ \ | | | | | | | | | | | | | | | [ticket/11424] Quick-Mod Tools race condition results in NO_MODE
| | * | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11424
| | * | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
| | | |/ | | |/| | | | | | | | | PHPBB3-11424
* | | | Merge branch '3.1.x'Marc Alexander2015-03-051-0/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3413 from kasimi/ticket/13540Marc Alexander2015-03-051-0/+4
| |\ \ \ | | |_|/ | |/| | | | | | [ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
| | * | [ticket/13540] Add total post count to mcp_topic_review_modify_row eventkasimi2015-02-171-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13540
| | * | [ticket/13540] Add topic_info to mcp_topic_review_modify_row eventkasimi2015-02-161-0/+2
| | | | | | | | | | | | | | | | PHPBB3-13540
* | | | Merge branch '3.1.x'Marc Alexander2015-02-181-8/+0
|\ \ \ \ | |/ / /
| * | | [ticket/13595] Removed unused codeJoshyPHP2015-02-131-8/+0
| | |/ | |/| | | | | | | PHPBB3-13595
* | | [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`Gaëtan Muller2015-02-034-7/+7
| | | | | | | | | | | | PHPBB3-13455
* | | [ticket/13455] Update calls to `request_var()`Gaëtan Muller2015-02-0311-129/+129
| | | | | | | | | | | | PHPBB3-13455
* | | Merge pull request #3281 from MGaetan89/ticket/13496Andreas Fischer2015-02-032-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13496] Change set_config_count() calls with $config->increment() * MGaetan89/ticket/13496: [ticket/13496] Update calls to `set_config_count()`
| * | | [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-022-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13496
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-02-032-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * develop-ascraeus: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| * | | Merge pull request #3361 from marc1706/ticket/13569Andreas Fischer2015-02-032-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13569] Add missing sql_freeresults and remove unneeded results * marc1706/ticket/13569: [ticket/13569] Add missing sql_freeresults and remove unneeded results
| | * | | [ticket/13569] Add missing sql_freeresults and remove unneeded resultsMarc Alexander2015-02-022-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13569
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-021-3/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3330 from kasimi/ticket/13540Joas Schilling2015-02-021-3/+33
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | [ticket/13540] Add core event for modifying topic review block data
| | * | | [ticket/13540] Added var row to both eventskasimi2015-01-251-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13540