aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | * develop-olympus: [ticket/11292] Fix: Newlines removed in display of PM reports
| | | * | | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
| * | | | | | | | [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-152-13/+11
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (20) and others # Via Andreas Fischer (3) and Oleg Pudeyev (2) * 'develop' of github.com:phpbb/phpbb3: (33 commits) [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing. [ticket/11250] Use user defined message as incomplete message [ticket/11250] Add tests for simple nesting and code [ticket/11250] Run tests by default and add an option for incomplete ones [ticket/11250] Fix parsing result with special chars [ticket/11250] Add tests for size and attachment [ticket/11250] Fix method names [ticket/11250] Add some comments and fix a description [ticket/11250] Add some more tests for quotes [ticket/11250] Move quote special cases from class to unit tests [ticket/11250] Add parsing tests for our basic bbcodes in simple cases [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/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-133-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
| * | | | | | | | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-203-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a very basic user loader class to handle querying/storing user data in a centralized location. Use DIC collection service for notification types/methods. Cleanup unused dependencies. Fix some other issues. PHPBB3-11103
| * | | | | | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-107-16/+16
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/install/schemas/mssql_schema.sql phpBB/report.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
| * | | | | | | | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-203-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
| * | | | | | | | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-183-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments that are not needed because the actions are completely self-explanatory PHPBB3-11103
| * | | | | | | | | [ticket/11103] Ability to query data before running create_insert_array()Nathan Guse2012-10-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark post/topic in queue notifications read when visiting mcp Change post/topic in queue notification url to use MCP. Fix the bug: Approving a topic marks the topic as read, but before the notification is created for the user approving the topic (if they would get a notification that the topic has been made). This causes it to be stuck "unread". PHPBB3-11103
| * | | | | | | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-111-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | | Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-10-091-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-041-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use phpbb_container everywhere (makes testing difficult) PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Topic/Post in queue notificationNathan Guse2012-09-151-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, bug fixes and cleanup PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Topic and post dis/approval notificationsNathan Guse2012-09-151-46/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the formatted title function, plaintext is not needed since email templates are used Fix a number of bugs. PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Starting approve_post type notificationNathan Guse2012-09-151-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Normalization of $phpbb_notifications variable nameNathan Guse2012-09-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use $phpbb_notifications instead of $notifications everywhere for consistency and conflict prevention. PHPBB3-11103
| * | | | | | | | | | [ticket/11103] Add/Update/Mark Read functions accept an array for the typeNathan Guse2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a lot of code in some areas (where the same data is sent, just for different types) Notifications for bookmarks PHPBB3-11103
| * | | | | | | | | | [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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 22:09:41 +0000