aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-1827-264/+418
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 developJoas Schilling2011-11-181-3/+9
| |\ | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| | * Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
| | |\
| | | * [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
| | | | | | | | | | | | | | | | PHPBB3-9008
| * | | 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 remote-tracking branch 'nickvergessen/ticket/10457' into developAndreas Fischer2011-11-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10457: [ticket/10457] Undefined variable $request, when print-viewing PMs
| | * | | | | [ticket/10457] Undefined variable $request, when print-viewing PMsJoas Schilling2011-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10457
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-6/+6
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9361] View correct error messages when editing account information
| | * | | | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-6/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9361: [ticket/9361] View correct error messages when editing account information
| | | * | | | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-6/+6
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the "current password" is only checked, when you change something. This means you get "Your profile has been updated." although you enter a wrong password. I also added proper error messages, when you leave the confirm fields empty, and sorted them in the order of the field appearances on the html page. PHPBB3-9361
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| | * | | | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9066: [ticket/9066] Move regex into get_preg_expression function and add tests [ticket/9066] Disallow some database prefix to prevent same errors and problems
| | | * | | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-141-0/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9066
| * | | | | | 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 developAndreas Fischer2011-11-132-5/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| | * | | | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-132-5/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/8616: [ticket/8616] Include old U_INBOX var for BC [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE [ticket/8616] Direct links in pm notification emails
| | | * | | | | [ticket/8616] Include old U_INBOX var for BCIgor Wiedler2011-11-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8616
| | | * | | | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8616
| | | * | | | | [ticket/8616] Direct links in pm notification emailsAlan2011-10-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import the "Direct links in pm notification emails" modification, version 1.0.1. PHPBB3-8616
| * | | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-11-132-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| | * | | | | | Merge remote-tracking branch 'igorw/ticket/10365' into develop-olympusAndreas Fischer2011-11-132-3/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10365: [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read [ticket/10365] Require m_report permission to see reports in mcp_post [ticket/10365] Make sure moderators only get mcp_reports link when allowed
| | | * | | | | | [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to readIgor Wiedler2011-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10365
| | | * | | | | | [ticket/10365] Require m_report permission to see reports in mcp_postIgor Wiedler2011-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was exposed to anyone with m_ perms in mcp_post_details. PHPBB3-10365
| | | * | | | | | [ticket/10365] Make sure moderators only get mcp_reports link when allowedIgor Wiedler2011-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The m_report permission is not not being checked when displaying the link to mcp_reports. PHPBB3-10365
| * | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-111-6/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10237] Display login-box for guests, when (un)subscribing Conflicts: phpBB/includes/functions_display.php
| | * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympusAndreas Fischer2011-11-111-6/+15
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10237: [ticket/10237] Display login-box for guests, when (un)subscribing
| | | * | | | | | | [ticket/10237] Display login-box for guests, when (un)subscribingJoas Schilling2011-11-061-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also initialise $is_watching for PHP Notice: Undefined variable is_watching PHPBB3-10237
| * | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-011-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| | * | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympusAndreas Fischer2011-11-011-0/+1
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9036: [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
| | | * | | | | | | [ticket/9036] Add template variable 'S_AUTH_READ' to forumlistJoas Schilling2011-10-291-0/+1
| | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9036
| * | | | | | | | 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-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10420] Update includes/startup.php for PHP 5.4.
| | * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympusIgor Wiedler2011-10-291-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10420: [ticket/10420] Update includes/startup.php for PHP 5.4.
| | | * | | | | | | | [ticket/10420] Update includes/startup.php for PHP 5.4.Andreas Fischer2011-10-181-2/+2
| | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP 5.4 dropped support for register globals and magic quotes. Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an E_CORE_ERROR error. PHPBB3-10420
| * | | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 07:40:20 +0000