aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ | | | | | | | | * develop-olympus: [ticket/10280] Change the display of user activation settings in the ACP.
| * [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| | | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-203-20/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-203-5/+5
| | | | | | | | PHPBB3-10446
| * [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-203-20/+5
| | | | | | | | PHPBB3-10446
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-3/+6
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
| |\ | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| | * [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | | | | | | | | | | | PHPBB3-10239
| | * [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
| | | | | | | | | | | | PHPBB3-10239
* | | [feature/extension-manager] Removing now unused acp_search codeNils Adermann2011-11-181-22/+0
| | | | | | | | | | | | PHPBB3-10323
* | | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-1810-26/+69
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (93 commits) [ticket/10157] Add notification to update cpfs when installing a language. [ticket/10185] Always set board startdate on conversion [ticket/10419] Reword the language strings [ticket/9361] View correct error messages when editing account information [ticket/10457] Undefined variable $request, when print-viewing PMs [ticket/10452] Fix xHTML errors when print-viewing PMs [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com. [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com. [ticket/10254] Remove subsilver2 as default style on theme. [ticket/10254] Remove style names from themes and fix some informations on it. [ticket/7138] Allow simple header and footer for trigger_error() messages [ticket/9066] Disallow some database prefix to prevent same errors and problems [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10437] Do not display announcements that are waiting for approval [ticket/10087] Organize bans in acp_baninto optgroups [ticket/8616] Include old U_INBOX var for BC [ticket/10435] Remove global announcement from forums total topic count [ticket/10435] Readd local announcements to total topic count in viewforum ... Conflicts: phpBB/install/database_update.php
| * \ \ Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-171-1/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/10157] Add notification to update cpfs when installing a language.
| | * | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-171-1/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10157: [ticket/10157] Add notification to update cpfs when installing a language.
| | | * | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-1/+8
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | We currently just copy the language-strings from the default language. But the admin should be reminded to change them. PHPBB3-10157
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-151-0/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | * | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10419: [ticket/10419] Reword the language strings [ticket/10419] Reword some language strings, minor code changes [ticket/10419] Add mbstring PHP ini parameters checks to ACP
| | | * | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| | | * | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-10419
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-5/+29
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10087] Organize bans in acp_baninto optgroups
| | * | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-5/+29
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10087: [ticket/10087] Organize bans in acp_baninto optgroups
| | | * | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-5/+29
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-10087
| * | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-131-6/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10190] Do not show hint about permissions when editing forum settings.
| | * | | Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympusIgor Wiedler2011-11-131-6/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10190: [ticket/10190] Do not show hint about permissions when editing forum settings.
| | | * | | [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-10190
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10410: [ticket/10410] Add option to display users in their first teampage group
| | * | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10410
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails. Conflicts: phpBB/install/database_update.php
| | * | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-291-2/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/9307: [ticket/9307] Add config variable to installation schema. [ticket/9307] Remove hardcoded chunk size of mass emails.
| | | * | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-241-2/+3
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new config option is 'email_max_chunk_size' I have not added an interface option to change this. PHPBB3-9307
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
| | * | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-10421
| * | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-201-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10390: [ticket/10390] Revert back to escaped script tags inside document.write [ticket/10390] Fix wording: fallback should be fall back [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback [ticket/10390] Drop http protocol for Microsoft's CDN option [ticket/10390] Reword the language for jQuery host/server options [ticket/10390] Fix a type-o - captialize AJAX [ticket/10390] Improve the jQuery CDN url generation function [ticket/10390] Move jQuery version definition [ticket/10390] Allow option for jQuery to be hosted by a remote CDN Conflicts: phpBB/install/database_update.php
| | * | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-271-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery will now be available via remote CDN from Google. Microsoft and jQuery CDNs have been removed, so we can simplify this option for the user. Default mode is NO so the copy of jQuery included with phpBB is served by default. PHPBB3-10390
| | * | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-261-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an option to the ACP so admins can choose to host jQuery from the local version shipped with phpBB, or via a popular CDN. PHPBB3-10390
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/9525] Minimum post length 0 is accepted but not working.
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9525: [ticket/9525] Minimum post length 0 is accepted but not working.
| | | * | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | PHPBB3-9525
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10074] Change default value of 'Set as special rank' to No
| | * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵Nils Adermann2011-10-141-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10074: [ticket/10074] Change default value of 'Set as special rank' to No
| | | * | | | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-10074
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| | * | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-141-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10278: [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. [ticket/10278] Also timeout when receiving data over a slow connection. [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. [ticket/10278] Return with a timeout error when fread() or fgets() time out. [ticket/10278] Also set timeout on stream in get_remote_file().
| | | * | | [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.Andreas Fischer2011-10-131-1/+1
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-10278
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10300' into developAndreas Fischer2011-10-131-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10300: [ticket/10300] Always set group attributes for teampage and legend
| | * | | | [ticket/10300] Always set group attributes for teampage and legendJoas Schilling2011-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in acp_groups.php removes unchanged attributes from the group_attributes array, to prevent issues with reapplying avatar/rank and more. This code causes problems with the new teampage/legend feature, because when the attribute is not set, the group is removed from the feature. Therefore I added an array with the keys that need to be set, when calling the function. PHPBB3-10300
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | * develop-olympus: [ticket/10400] Allow forum name to be '0'
| | * | | [ticket/10400] Allow forum name to be '0'Joas Schilling2011-10-071-1/+1
| | | |/ | | |/| | | | | | | | | PHPBB3-10400
* | | | [feature/extension-manager] Rename default methods to core methods on finder.Nils Adermann2011-11-182-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There are now extension_ and core_ methods for all finder settings as well as a generic method which overwrites both. PHPBB3-10323
* | | | [feature/extension-manager] Allow extensions to define captcha plugins.Nils Adermann2011-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The base class for captcha plugins has been renamed, but the old name continues to exist as an empty subclass of it for backwards compatability. PHPBB3-10323
* | | | [feature/extension-manager] Avoid unecessary loading of acp classesNils Adermann2011-09-291-10/+6
| | | | | | | | | | | | | | | | PHPBB3-10323
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-20 05:14:41 +0000