aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-163-2/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | PHPBB3-8610
| * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-132-16/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| * | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| | | | | | | | | | | | PHPBB3-8610
| * | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| | | | | | | | | | | | | | | | | | | | | Update bookmarks and subscriptions to add bookmarks/subscriptions to the new topic when using the split_topic function PHPBB3-8610
| * | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging posts into another topic using the merge_posts function. PHPBB3-8610
| * | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when forking topics using the mcp_fork_topic function. PHPBB3-8610
| * | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging multiple topics using the merge_topics function. PHPBB3-8610
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-142-13/+11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-122-2/+2
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| * | [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| |/ | | | | | | PHPBB3-11162
* | Merge PR #722 branch 'Senky/ticket/9918' into developOleg Pudeyev2012-11-062-6/+6
|\ \ | | | | | | | | | | | | | | | * Senky/ticket/9918: [ticket/9918] default values in request_var changed to one string [ticket/9918] $redirect variable used from now
| * | [ticket/9918] default values in request_var changed to one stringSenky2012-04-152-3/+3
| | | | | | | | | | | | | | | | | | As per marc1706's note, all request_var functions now have only one string in default value PHPBB3-9918
| * | [ticket/9918] $redirect variable used from nowSenky2012-04-092-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | According to comment marc1706 added to tracker http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120 I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed. PHPBB3-9918
* | | Merge PR #786 branch 'brunoais/ticket/10845' into developOleg Pudeyev2012-11-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10845: [ticket/10845] Removed one empty line that wasn't supposed to be there [ticket/10845] Two of the three colouns were missing in the DB update file [ticket/10845] Remove censor from text [ticket/10845] Now it shows the preview post parsed [ticket/10845] Changed the report system. Now it saves posts with the bbcode Conflicts: phpBB/includes/functions_content.php
| * | | [ticket/10845] Remove censor from textBruno Ais2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to remove the censor, I added a new parameter to generate_text_for_display(), that new parameter is used to tell if the text should be censored or not. Defaults to true. PHPBB3-10845
| * | | [ticket/10845] Now it shows the preview post parsedBruno Ais2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, the preview post in the report details now shows with the BBCode parsed. Note: Tested with all BBCodes I have including one personalised to write the <s> BBCode. PHPBB3-10845
* | | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-178-10/+10
| | | | | | | | | | | | | | | | PHPBB3-11023
* | | | [ticket/11140] Fix an error from an incorrect variable nameNathan Guse2012-10-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11140
* | | | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-201-1/+12
|\ \ \ \
| * | | | [feature/php-events] Fix naming and doc of core.mcp_view_forum_modify_topicrowJoas Schilling2012-08-041-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | [feature/php-events] Add missing global $phpbb_dispatcherJoas Schilling2012-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | [feature/events] Fixing events issuesMichael Cullum2012-08-011-3/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | [feature/events] Adding core.mcp_forum_topicrow ledgeMichael Cullum2012-08-011-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | [ticket/11052] update search backend constructor everywhereDhruv2012-08-152-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11052
* | | | | [ticket/10990] Changes for developNathan Guse2012-07-221-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-10990
* | | | [feature/pagination-as-list] New parameter for name of start varDrae2012-07-188-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new parameter to hold the name of the start variable. This fulfills ticket PHPBB3-8535. PHPBB3-10968
* | | | [feature/pagination-as-list] Updates for nils commentsDrae2012-07-188-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-remove deprecated functions, change on_page to phpbb_on_page, add null returns, remove globals and pass as params. PHPBB3-10968
* | | | [feature/pagination-as-list] Rename and deprecate functionsDrae2012-07-188-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Returned and marked deprecated topic_generate_pagination. Rename new function in line with coding guidelines. PHPBB3-10968
* | | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-188-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
* | | | [ticket/10968] Render pagination within the templateDrae2012-07-188-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since phpBB 2 pagination has been rendered mostly within the source. This limits just what designers can do with pagination. The current form is also questionable in terms of "best practice". The aim is to move rendering completely to the template via the use of a block element. Enabling S_ template vars also allows for control over specific aspects of the pagination output such as next, previous, active and ellipsis. Related to this - merging the capabilities of the topic_generate_pagination with generate_pagination removes an element of duplication. PHPBB3-10968
* | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
|/ / / | | | | | | | | | | | | | | | Deleted the implode that had no reason to be there PHPBB3-10871
* | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-201-2/+2
|\ \ \ | |/ / |/| / | |/ | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-2/+2
| | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-311-2/+2
| | | | | | | | PHPBB3-10609
* | [ticket/10273] Fixed accepting / denying posts AJAX.Callum Macrae2012-03-311-2/+29
| | | | | | | | PHPBB3-10273
* | [feature/save-post-on-report] bbcode_nl2br missing.Bruno Ais2012-03-191-3/+4
| | | | | | | | | | | | | | New lines were missing in the reported_post_text. By adding the bbcode_nl2br() became as it is supposed to. PHPBB3-10600
* | [feature/save-post-on-report] Changed the name of the columnBruno Ais2012-03-191-2/+2
| | | | | | | | | | | | | | | | The name of the column was changed from reported_post AND reported_text to reported_post_text. This change was made by request PHPBB3-10600
* | [feature/save-post-on-report] The complete changes for this featureBruno Ais2012-03-191-2/+2
| | | | | | | | | | | | | | This covers all the changes so that when a report is made, the post itself is copied and displayed in the MCP instead of the current post. Unfortunatly, I made all commits in the wrong way and they were lost. Now I have only the final files.
* | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-161-0/+11
|\ \ | |/ | | | | | | * develop-olympus: [ticket/8636] Add resync option to topic_view moderation page
| * [ticket/8636] Add resync option to topic_view moderation pageJoas Schilling2012-02-231-0/+11
| | | | | | | | PHPBB3-8636
* | [ticket/10637] Leftovers from implementation of extensions in mcp_postVjacheslav Trushkin2012-02-091-4/+2
| | | | | | | | | | | | Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323 PHPBB3-10637
* | [ticket/10637] Leftovers from implementation of extensions in mcp_mainVjacheslav Trushkin2012-02-091-7/+2
| | | | | | | | | | | | Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323 PHPBB3-10637
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-3120-40/+20
| | | | | | | | PHPBB3-9916
* | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-259-51/+18
| | | | | | | | PHPBB3-10345
generated by cgit v1.2.1 (git 2.21.0) at 2026-03-31 14:39:12 +0000