aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | 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
| * | | Merge remote-tracking branch 'brunoais/ticket/11641' into developJoas Schilling2013-08-031-10/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11641: [ticket/11641] Use $parse_flags [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
| | * | | [ticket/11641] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
| | * | | [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.phpBruno Ais2013-07-161-10/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11641
| * | | Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/11653: [ticket/11653] Use $parse_flags [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
| | * | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| | * | | [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11653
| * | | Merge pull request #1586 from brunoais/ticket/11654Nathan Guse2013-07-291-13/+2
| |\ \ \ | | | | | | | | | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.php
| | * | | [ticket/11654] Moved some code to reduce line width.Bruno Ais2013-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| | * | | [ticket/11654] first parameter failBruno Ais2013-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
| | * | | [ticket/11654] generate_text_for_display on mcp/mcp_warn.phpBruno Ais2013-07-181-13/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11654
* | | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-164-14/+14
| | | | | | | | | | | | | | | | PHPBB3-11700
* | | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-143-9/+9
|/ / / | | | | | | | | | PHPBB3-11700
* | | [ticket/9657] Keep approval state of posts/topics when copying themJoas Schilling2013-07-131-6/+35
| | | | | | | | | | | | PHPBB3-9657
* | | [ticket/9657] Fix a little error when moving softdeleted topicsJoas Schilling2013-07-121-1/+0
| | | | | | | | | | | | PHPBB3-9657
* | | [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] Initialise variable outside of the loopJoas Schilling2013-07-111-0/+1
| | | | | | | | | | | | PHPBB3-9657
* | | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-114-16/+24
| | | | | | | | | | | | 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] Populate data about post's delete status in mcp_postJoas Schilling2013-03-121-0/+31
| | | | | | | | | | | | 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] Fix newly added empty lineJoas Schilling2013-03-101-1/+0
| | | | | | | | | | | | 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
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-052-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-043-91/+101
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/install/database_update.php
| * \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-14/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-042-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although get_user_avatar() is not new, the phpbb prefix was prepended. This is due to the fact that it was entirely rewritten and is therefore more or less a completely new function. PHPBB3-10018
| * | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-243-11/+82
| |\ \ \ \
| * \ \ \ \ Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into ↵Marc Alexander2012-11-122-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/avatars Conflicts: phpBB/adm/style/acp_groups.html phpBB/adm/style/acp_users_avatar.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_display.php phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/styles/prosilver/template/ucp_avatar_options.html
| | * \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-218-17/+36
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (201 commits) [feature/new-tz-handling] Don't use global user but make it a parameter [feature/new-tz-handling] Fix size of suggestion button in chrome [feature/new-tz-handling] Fall back to UTC, if the timezone is invalid [feature/new-tz-handling] Add previous selected value to validation if valid [feature/new-tz-handling] Display suggestion when a different value is selected [ticket/10998] Add border-radius to forum rules block - prosilver [feature/new-tz-handling] Remove additional marking of selected items [feature/new-tz-handling] Move update helper function to new class [feature/new-tz-handling] Fix unit test [feature/new-tz-handling] Delete old variable which is not used anymore [feature/new-tz-handling] Rename $user->tz back to $user->timezone [feature/pagination-as-list] New parameter for name of start var [feature/pagination-as-list] Updates for nils comments [feature/pagination-as-list] Rename and deprecate functions [feature/pagination-as-list] Various fixes and improvements [ticket/10968] Render pagination within the template [feature/new-tz-handling] Remove "timezone might be numeric" [feature/new-tz-handling] Add function to update the timezone [feature/new-tz-handling] Correctly update user and board timezones on update [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL ...
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-272-4/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (255 commits) [ticket/10935] Limit number of PM rules per user to 5000 [ticket/10801] Fixed quickmod tools. [ticket/9551] uncomment line and change length to 255 [ticket/10925] Clarify installation requirements for SQLite [ticket/10938] Serve subforum listing on forumlist from template loop [ticket/10640] Change subject length in mcp in subsilver [ticket/10640] Change subject length in MCP [ticket/10640] Do not change default value of truncate_string() [ticket/10640] Change maximum subject length [ticket/10936] remove PCRE and mbstring support check [ticket/10936] fix language key [ticket/10829] Delete T_STYLESHEET_NAME - no longer used. [ticket/10829] $style_name -> $style_path in style class. [ticket/10743] Renaming user->theme [ticket/10743] Changing obtain_cfg_items [ticket/10882] Fix test name - oops. [ticket/10931] Apply strtolower() correctly, i.e. not on false. [ticket/10931] Also test get_bytes() and get_string() with false. [ticket/10931] Make to_numeric function globally available. [ticket/10932] Use included composer.phar in build process ... Conflicts: phpBB/includes/mcp/mcp_warn.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_avatar_options.html
| | * \ \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-073-8/+36
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (335 commits) [ticket/10575] Adding public visibility to the methods. [ticket/10575] Fixing non-static access to static functions get_instance [ticket/10547] User is not logged in as admin after installation [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list [ticket/10760] Fix numbering in php fun facts. [ticket/10760] Value must be quoted as it might be two words. [ticket/10760] PHP is great. This commit is the proof. [ticket/10760] Catch both versions of parse error output in php. [ticket/10607] Added 'Powered by' translation string. [ticket/10760] Account for display_errors=stderr in pre-commit hook. [ticket/10760] Quote PHP_BIN when using it. [ticket/10760] Use echo -e only if echo understands -e. ...
| | * | | | | | | | [feature/avatars] Modularized AvatarsCullen Walsh2012-03-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modularized avatar system that easily allows plugins to be created for various avatar services, such as Gravatar. This inital commit includes module support and is backwards compatible with 3.0 avatars, but does notcontain ACP or UCP modules for manipulating new avatars. PHPBB3-10018
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-11 02:02:02 +0000