aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_queue.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-11/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
| |\ | | | | | | | | | | | | | | | | | | * brunoais/ticket/11643: [ticket/11643] Use $parse_flags [ticket/11643] Fixed typo in the variable name. [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
| | * [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
| | * [ticket/11643] 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-11643
| | * [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-6/+6
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-3/+3
|/ / | | | | | | PHPBB3-11700
* | [ticket/9657] Notifications do not require emails or jabber anymoreJoas Schilling2013-07-111-2/+2
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Use include instead of include_onceJoas Schilling2013-07-111-3/+9
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-3/+5
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Add , to last element of an arrayJoas Schilling2013-07-111-6/+6
| | | | | | | | PHPBB3-9657
* | [ticket/9657] DO not use \" inside of double quotesJoas Schilling2013-07-111-4/+4
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Correctly split disapproving from perma deleting postsJoas Schilling2013-03-111-9/+54
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Fix missing global $phpbb_containerJoas Schilling2013-03-111-1/+1
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Remove unused email variablesJoas Schilling2013-03-071-9/+1
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Correctly state when to refresh last/first post info on approvingJoas Schilling2013-03-061-2/+4
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Rebuild notifications in mcp_queue.phpJoas Schilling2013-03-051-85/+72
| | | | | | | | PHPBB3-9657
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-031-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
| * [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-151-1/+13
| | | | | | | | PHPBB3-11103
| * [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-4/+9
| | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976 PHPBB3-11103
| * [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-201-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-12/+16
| | | | | | | | | | | | This is going to require you recreate the db tables. PHPBB3-11103
| * [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-11/+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] 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
* | [feature/soft-delete] Split deleting soft-deleted posts from unapproving postsJoas Schilling2012-12-201-6/+57
| | | | | | | | 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] Fix the rest of *_approved and the delete_post unit testJoas Schilling2012-11-101-3/+3
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Append _approved to *_posts and *_topics column namesJoas Schilling2012-11-091-1/+1
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Use request object instead of direct accessJoas Schilling2012-11-091-16/+15
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Fix restoring/approving posts with mcp moderationJoas Schilling2012-10-311-8/+8
| | | | | | | | 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-231-1/+1
| | | | | | | | | | | | Only disapproving in queue is missing. PHPBB3-9567
* | [feature/soft-delete] Use correct language when restoring topics in MCPJoas Schilling2012-10-211-9/+5
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Split unapproved/soft deleted posts from topicsJoas Schilling2012-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a topic is soft deleted through a moderator, the topic_delete_user is set. If it is passively soft deleted (f.e. while the only approved post is deleted) the topic_delete_user is not set. This way, we can distinguish between these two cases. The same also applies to unapproved posts. So we need to set the topic_delete_user when an unapproved topic is posted. Topics that were soft deleted/unapproved by a user (rather then passive) are going to be displayed in the Topics modules, while all others are in the posts modules of the MCP queue. PHPBB3-9567
* | [feature/soft-delete] Display guest username in topic list instead of "Guest"Joas Schilling2012-10-171-2/+2
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Removed unused old functionsJoas Schilling2012-10-161-200/+0
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Merge approving and restoring topics into one functionJoas Schilling2012-10-161-14/+173
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Merge approving and restoring posts into one functionJoas Schilling2012-10-161-65/+124
| | | | | | | | PHPBB3-9567
* | [feature/soft-delete] Add module for soft deleted topicsJoas Schilling2012-10-151-16/+104
| | | | | | | | | | | | | | | | Unapproved/soft deleted posts are posts, that have a different visibility than the topic. All others will be hidden from the posts list and can be managed with the topic modules. PHPBB3-9567
* | [feature/soft-delete] Add checkbox to restoring posts like on approveJoas Schilling2012-10-151-27/+45
| | | | | | | | PHPBB3-9567