aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [ticket/11772] Do not send out new topic/post notifications when reapprovingJoas Schilling2014-04-251-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add notifications, if we are not reapproving post When the topic was already approved, but was edited and now needs re-approval, we don't want to notify the users again. PHPBB3-11772
| * | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-257-15/+17
| |/ / | | | | | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
* | | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into ↵Nathaniel Guse2014-05-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus # By Nicofuma # Via Nicofuma * remotes/Nicofuma/ticket/12445: [ticket/12445] Change the formulation [ticket/12445] Disapproved post: the name of the poster should be in logs
| * | | [ticket/12445] Disapproved post: the name of the poster should be in logsNicofuma2014-04-261-1/+1
| |/ / | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12445 PHPBB3-12445
* | | Merge pull request #2362 from n-aleha/ticket/12186aJoas Schilling2014-04-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12186] Move PM reports below post reports while installing for ascraeus * n-aleha/ticket/12186a: [ticket/12186] Move PM reports below post reports while installing for ascraeus [ticket/12186] Move PM reports below post reports while installing
| * \ \ Merge branch 'ticket/12186' into ticket/12186an-aleha2014-04-271-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * [ticket/12186] Move PM reports below post reports while installingn-aleha2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | In mcp, move PM reports below post reports while installing. PHPBB3-12186
| | * [ticket/12247] Makes static usernames workMarcos Bjorkelund2014-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Relative to the last ticket, this allows static usernames to work correctly (those inserted in the post-column post_username) when sending the e-mail, instead of showing just "Anonymous". PHPBB3-12247
| | * [ticket/12247] Add ['username'] to mcp_queue.php's user_notification()Marcos Bjorkelund2014-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It includes the poster's username in the email notifications of posts that get approved by moderators. This is done by adding the username to every user_notification() function located in /phpBB/includes/mcp/mcp_queue.php. PHPBB3-12247
* | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-294-10/+5
|/ / | | | | | | | | | | | | | | | | * There MUST NOT be trailing whitespace at the end of lines. * There MUST NOT be whitespace before the first content of a file. * There MUST NOT be whitespace after the last content of a file. * Functions MUST NOT contain multiple empty lines in a row. PHPBB3-12458
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into ↵Nils Adermann2014-04-101-4/+13
|\ \ | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12373: [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
| * | [ticket/12373] Add to and from forum_id to LOG_MOVE log entriesJoas Schilling2014-04-081-4/+13
| | | | | | | | | | | | PHPBB3-12373
* | | [ticket/11352] Redirect the user back to view*.php after disapprovingJoas Schilling2014-04-071-0/+16
|/ / | | | | | | | | | | | | | | The user should be redirected back to: - the topic, if he came from viewtopic and the topic still exists - the forum, if he came from viewtopic, but the topic does not exist anymore PHPBB3-11352
* | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-052-13/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-261-9/+0
| | | | | | | | | | | | PHPBB3-7707
| * | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-162-13/+13
| | | | | | | | | | | | PHPBB3-7707
* | | [ticket/9758] Fixed bug in mcp_warn.phpCrizzo2014-03-281-2/+4
| | | | | | | | | | | | PHPBB3-9758
* | | [ticket/9758] Error because of missing functions_display.php fixedCrizzo2014-03-281-2/+3
| | | | | | | | | | | | PHPBB3-9758
* | | [ticket/9758] Removed useless if-conditions to include functions.phpCrizzo2014-03-282-8/+0
| | | | | | | | | | | | PHPBB3-9758
* | | [ticket/9758] Adds global template variable CURRENT_USER_AVATARCrizzo2014-03-282-3/+3
|/ / | | | | | | PHPBB3-9758
* | Merge pull request #2045 from rxu/ticket/12213Nathan Guse2014-02-191-0/+11
|\ \ | | | | | | [ticket/12213] Add MCP events for custom quick moderation options
| * | [ticket/12213] Add MCP events for custom quick moderation optionsrxu2014-02-201-0/+11
| | | | | | | | | | | | | | | | | | | | | Add core events to mcp.php and mcp_main.php. This allows extensions to add and to handle custom quick moderation options. PHPBB3-12213
* | | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-038-8/+0
|/ / | | | | | | PHPBB3-12153
* | Merge pull request #1889 from prototech/ticket/11963Nathan Guse2013-12-302-11/+37
|\ \ | | | | | | [ticket/11963] Remove stale MCP notifications.
| * | [ticket/11963] Fix undefined variable: post_data when mass-approving topics.Cesar G2013-11-231-5/+28
| | | | | | | | | | | | PHPBB3-11963
| * | [ticket/11963] Delete topic_in_queue notifications in MCP approve_details modeCesar G2013-11-231-0/+5
| | | | | | | | | | | | PHPBB3-11963
| * | [ticket/11963] Don't depend on user_notify flag to delete report notifications.Cesar G2013-11-231-6/+4
| | | | | | | | | | | | PHPBB3-11963
* | | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-258-25/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| * | | [ticket/11849] Fix more function callsJoas Schilling2013-12-183-8/+13
| | | | | | | | | | | | | | | | PHPBB3-11849
| * | | [ticket/11849] Update more MCP calls to pagination classJoas Schilling2013-12-185-17/+17
| |/ / | | | | | | | | | PHPBB3-11849
* | | [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.Cesar G2013-11-212-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The $redirect assignment is not necessary because the variable has already been set near the start of the functions. The redirect value will also never default to index.php because a default value has already been provided when $redirect is initially assigned and passed to the template as a hidden field. PHPBB3-11672
* | | [ticket/11672] The json response call exits so the else is not necessary.Cesar G2013-11-191-23/+11
| | | | | | | | | | | | PHPBB3-11672
* | | [ticket/11672] Remove the messages for lock/unlock/change topic type.Cesar G2013-11-191-22/+22
| | | | | | | | | | | | PHPBB3-11672
* | | [ticket/11672] Clean up the logic in mcp_queue.php.Cesar G2013-11-191-97/+75
| | | | | | | | | | | | PHPBB3-11672
* | | [ticket/11672] Remove some messages that were missed in mcp_queue.php.Cesar G2013-11-191-2/+10
| | | | | | | | | | | | PHPBB3-11672
* | | [ticket/11672] Replace sprintf() usage with $user->lang().Cesar G2013-11-191-1/+1
| | | | | | | | | | | | PHPBB3-11672
* | | [ticket/11672] Removed unnecessary text from alerts.callumacrae2013-11-191-1/+5
|/ / | | | | | | | | | | | | Messages like "Return to forum last visited" are entirely unnecessary when using AJAX to delete a post, so this commit removes them. PHPBB3-11672
* | Merge remote-tracking branch 'prototech/ticket/11890' into developAndreas Fischer2013-10-081-1/+1
|\ \ | | | | | | | | | | | | * prototech/ticket/11890: [ticket/11890] Fix untranslated string when deleting posts through MCP.
| * | [ticket/11890] Fix untranslated string when deleting posts through MCP.Cesar G2013-10-081-1/+1
| | | | | | | | | | | | PHPBB3-11890
* | | [ticket/11892] Fix undefined variables: to_forum_id & to_topic_idCesar G2013-10-082-39/+15
|/ / | | | | | | PHPBB3-11892
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-166-55/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * \ Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-122-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11829] Use report_closed to determine status in MCP report_details Conflicts: phpBB/styles/prosilver/template/mcp_post.html
| | * [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-151-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11775] Split test into multiple steps [ticket/11775] Add functional test for moving the last post [ticket/11775] Backport moving of the posting functions to 3.0 [ticket/11775] Fix error when moving the last post to another topic Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | | | | | | | | | PHPBB3-11775
| * | [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
| | | | | | | | | | | | PHPBB3-11774
| * | Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11642: [ticket/11642] Use $parse_flags [ticket/11642] Fixed typo in the variable name. [ticket/11642] generate_text_for_display on mcp/mcp_post.php
| | * | [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| | * | [ticket/11642] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642
| | * | [ticket/11642] generate_text_for_display on mcp/mcp_post.phpBruno Ais2013-07-161-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11642