aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | [ticket/11103] Restyle the notification listNathan Guse2012-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very rough (lots of inline CSS, very ugly) PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Post notificationsNathan Guse2012-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
* | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-12-203-11/+82
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission-rebase * 'develop' of https://github.com/phpbb/phpbb3: (544 commits) [feature/events] Fix improperly named event in documentation [feature/events] Fix alphabetization of events [feature/events] Put events in alphabetical order [feature/events] Make EVENTS.md lowercase [ticket/11285] Use more granularity in dependency checks in compress test [ticket/10880] The m_approve permisson no longer implies f_noapprove. [ticket/10803] Show failure message until user dismisses it [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [feature/events] Use ` to escape HTML tags in markdown [feature/events] Remove HTML tags from markdown so they don't get parsed [ticket/10954] Miscellaneous coding fixes [feature/events] Remove extraneous space [feature/events] Add markdown template event documentation file [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) [feature/events] Fix typo in event name [ticket/10763] Use self when calling get_extension() in filespec class [feature/events] Fix more subsilver2 events [feature/events] Fix some subsilver2 events ... Conflicts: phpBB/install/database_update.php phpBB/posting.php
| * | | | | | | | | | 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
* | | | | | | | | [feature/soft-delete] Split deleting soft-deleted posts from unapproving postsJoas Schilling2012-12-202-10/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | | | [feature/soft-delete] Split up on the initial switch instead of a second oneJoas Schilling2012-12-201-41/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixing some documentation issues PHPBB3-9657
* | | | | | | | | [feature/soft-delete] Fix a problem with "delete topics" in mcpJoas Schilling2012-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | | | [feature/soft-delete] Add delete information to approve deatils pageJoas Schilling2012-12-181-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | | | [feature/soft-delete] Add "Restore" to the mcp forum quick moderationJoas Schilling2012-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | | | [feature/soft-delete] Fix a problem with the "only softdeleted posts" logicJoas Schilling2012-12-181-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | | | | Merge remote-tracking branch 'remotes/phpbb/develop' into ↵Joas Schilling2012-11-108-17/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-merge-develop # By Oleg Pudeyev (45) and others # Via Oleg Pudeyev (42) and others * remotes/phpbb/develop: (289 commits) [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON} [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [ticket/10172] Show prosilver birthday list even if there are no birthdays. [ticket/11050] make all properties protected in all search backends [ticket/11050] get_common_words() returns empty array for sphinx [ticket/11050] fix tidied search query docblock language [ticket/11050] fix min/max length docblock language [ticket/11050] multi sentences separated by period in docblocks [ticket/11050] fix separated spelling in docblock [ticket/11050] fix split words doc block language [ticket/11050] remove class word from docblocks ... Conflicts: phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/language/en/acp/permissions_phpbb.php phpBB/styles/prosilver/template/posting_editor.html
| * | | | | | | | 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
* | | | | | | | [feature/soft-delete] Link to delete_topics module when the topic is deletedJoas Schilling2012-11-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-104-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Append _approved to *_posts and *_topics column namesJoas Schilling2012-11-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Use request object instead of direct accessJoas Schilling2012-11-092-41/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)Joas Schilling2012-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Correctly manage soft deleting via MCPJoas Schilling2012-11-021-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Invert the logic on confirm boxJoas Schilling2012-11-011-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Permanent delete is now the checkbox rather then softdelete. PHPBB3-9567
* | | | | | | | [feature/soft-delete] Display message when the posts are already soft deletedJoas Schilling2012-10-311-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix restoring/approving posts with mcp moderationJoas Schilling2012-10-312-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Allow to soft delete posts in the MCP quick moderationJoas Schilling2012-10-302-6/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderationJoas Schilling2012-10-271-8/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix disapproving posts/topics in queueJoas Schilling2012-10-231-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix some more topic/post count handlingJoas Schilling2012-10-232-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only disapproving in queue is missing. PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix mcp_move_topic() topic/post count handlingJoas Schilling2012-10-231-52/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Fix some more uses of topic_replies_realJoas Schilling2012-10-222-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
* | | | | | | | [feature/soft-delete] Correctly calculate the number of replies everywhereJoas Schilling2012-10-222-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9567
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-14 13:09:50 +0000