aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-122-3/+3
| | | | | | | Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
* Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-101-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10939: [ticket/10939] Added documentation for phpbb_request::file [ticket/10939] Added tests for phpbb_request::file [ticket/10939] Modified the default return for $request->file [ticket/10939] Modified fileupload tests to deal with new behaviour [ticket/10939] Modified mock request class to handle deactivated $_FILES [ticket/10939] Modified acp_groups.php to not use $_FILES [ticket/10939] Modified ucp_groups.php to not use $_FILES [ticket/10939] Modified functions_user.php to not use $_FILES [ticket/10939] Modified message_parser.php to not use $_FILES [ticket/10939] Modified functions_upload to not use $_FILES [ticket/10939] Modified request test slightly to include $_FILES [ticket/10939] Added $_FILES handling to phpbb_request
| * [ticket/10939] Modified acp_groups.php to not use $_FILESFyorl2012-08-151-2/+4
| | | | | | | | PHPBB3-10939
* | Merge branch 'develop-olympus' into developNils Adermann2012-11-091-1/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [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) [develop-olympus]Igor Wiedler2012-11-091-1/+1
| | | | | | | | | | | | PHPBB3-11181
* | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-0665-4004/+1996
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (2171 commits) [ticket/11164] Update composer.phar [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. [ticket/10933] Dependency inject template context. [ticket/10933] Expanded prose documentation for phpbb_extension_provider. [ticket/10933] Specify empty template path for absolute includephp test. [ticket/10933] Useful documentation for template locate function [ticket/10933] Typo fixes [ticket/10933] Initialize template context when template is constructed. [ticket/11099] Mark acp_ban::display_ban_options() as static. [ticket/11158] Require acl_u_sig for ucp signature module. [ticket/11158] Revert old fix in PHPBB3-10186. [ticket/11159] static public is the currently approved order. [ticket/11157] static public is the currently approved order. [ticket/11157] Fix remaining captcha spam. [ticket/11157] get_captcha_types is an instance method. [ticket/11156] Delete "Misc" tab of forum based permissions + move items [ticket/10848] Move include up. [ticket/11014] Fix old pagination assignment [ticket/11018] Fix several paginations in ACP [ticket/11014] Fix IF statements for new template pagination ... Conflicts: phpBB/includes/functions_user.php
| * | | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | It is called statically from mcp_ban. PHPBB3-11099
| * | | [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is specific to a particular captcha factory implementation, instantiate a captcha factory to invoke it. PHPBB3-11157
| * | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-176-12/+11
| | | | | | | | | | | | | | | | PHPBB3-11023
| * | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-102-6/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/8713: [ticket/8713] Update untrimmed_variable() doc block. [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users. [ticket/8713] Trim password in auth_db to keep compatibility. [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. [ticket/8713] Rename untrimed_variable() to untrimmed_variable(). [ticket/8713] DRY: variable() and untrimed_variable() into a protected method. [ticket/8713] Fix type_cast_helper.php doc blocks: Add punctuation etc. [ticket/8713] Always trim array keys. [ticket/8713] Add simple (non-nested) test case for untrimmed set_var(). [ticket/8713] Use \t in double quotes instead of tabs. [ticket/8713] Use correct parameter for nested data. [ticket/8713] Adjust test method name to other recursive_set_var() tests. [ticket/8713] Do not trim login inputs
| | * | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only auth_db is supported there and the password needs to be trimmed for compatibility because user_password stores phpbb_hash(htmlspecialchars(trim($password))) Setting passwords for other auth modules is currently not supported. Once setting/changing passwords is supported by auth plugins, the untrimmed_variable() should be used here and the result should be passed to the auth plugin. PHPBB3-8713
| | * | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-082-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-8713
| | * | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a function to request variables which are not trimmed. All requests for passwords (except forum passwords) now use the untrimmed request function. PHPBB3-8713
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-0/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11021: [ticket/11021] Remove unnecessary line spacing in functions.php [ticket/11021] Use L_SITE_HOME instead of L_HOME [ticket/11021] Better language strings for site home url/text [ticket/11021] subsilver2 support [ticket/11021] Add the option to specify a Site home URL and text
| | * | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11021
| * | | | [ticket/10631] Fix a spelling typoMichael C.2012-09-011-1/+1
| | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Adjust prefixes to be easier to understandUnknown Bliss2012-09-011-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Make failure to meet ext enable requirements clearerNathan Guse2012-09-011-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn the blocks red on the details page if requirement is not met. Also changing a how the errors come up when trying to enable/disable an extension when they cannot be. PHPBB3-10631
| * | | | [ticket/10631] Various front-end fixes (extensions manager)Nathan Guse2012-09-011-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Back button from details Add cancel button from actions Correct language strings PHPBB3-10631
| * | | | [ticket/10631] Functional acp_extensions test, cleanupNathan Guse2012-09-011-18/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] get_extension_metadata_manager -> ↵Nathan Guse2012-09-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_extension_metadata_manager PHPBB3-10631
| * | | | [ticket/10631] Simplify exceptionsNathan Guse2012-09-011-8/+20
| | | | | | | | | | | | | | | | | | | | PHPBB-10631
| * | | | [ticket/10631] Use exceptions for errors. Build action list dynamically.Nathan Guse2012-09-011-28/+83
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fix some issues as noted in github comments, significantly ↵Nathan Guse2012-09-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified validation PHPBB3-10631
| * | | | [ticket/10631] Remove references to delete extensionNathan Guse2012-09-011-15/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Validation for extensionsNathan Guse2012-09-011-18/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Use display name if availableNathan Guse2012-09-011-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Stagger the enable/disable/purge for extensionsNathan Guse2012-09-011-3/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fix list_available_extsNathan Guse2012-09-011-4/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Various tidbits and cleanup on the acp extensions managerNathan Guse2012-09-011-54/+41
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fix so it installs the module in the correct placeMichael Cullum2012-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Adding docblocksMichael Cullum2012-09-011-0/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fixing and finishing the extension metadata class.Michael Cullum2012-09-011-33/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] A few more extension admin changesMichael Cullum2012-09-011-3/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fixing some items mentioned in PRMichael Cullum2012-09-011-74/+37
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fixing some extension admin issues foundMichael Cullum2012-09-011-16/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | [ticket/10631] Fixing some issues spotted in extensions adminMichael Cullum2012-09-011-47/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing whitespace, cast the items from the json file straight into template vars (not via variables) and fixing some double quotes to single quotes. PHPBB3-10631
| * | | | [ticket/10631] Adding an extensions adminMichael Cullum2012-09-012-0/+299
| | | | | | | | | | | | | | | | | | | | PHPBB3-10631
| * | | | Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into developDavid King2012-08-202-14/+193
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forumJoas Schilling2012-08-181-5/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix core.acp_manage_forums_update_data_after varsJoas Schilling2012-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Add event core.acp_manage_forums_move_contentJoas Schilling2012-08-081-1/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix doc and naming of core.acp_manage_forums_move_childrenJoas Schilling2012-08-081-4/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix doc and naming of acp_manage_forums_update_data_afterJoas Schilling2012-08-081-2/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Add new event core.acp_manage_forums_update_data_beforeJoas Schilling2012-08-081-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows you to remove data from forum_data_sql before we update/create the forum PHPBB3-9550
| | * | | [feature/php-events] Fix naming and doc of core.acp_manage_forums_validate_dataJoas Schilling2012-08-081-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix naming and doc of core.acp_manage_forums_display_formJoas Schilling2012-08-081-2/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix naming and doc of acp_manage_forums_initialise_dataJoas Schilling2012-08-081-6/+21
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| | * | | [feature/php-events] Fix doc and naming of core.acp_forums_request_forum_dataJoas Schilling2012-08-081-1/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-9550