aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-05-234-6/+5
|\ | | | | | | | | * develop-olympus: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| * Merge remote-tracking branch 'p/ticket/9630' into develop-olympusAndreas Fischer2011-05-234-6/+5
| |\ | | | | | | | | | | | | * p/ticket/9630: [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
| | * [ticket/9630] Make language for moving posts clearer in quickmod/mcp.Oleg Pudeyev2011-05-024-6/+5
| | | | | | | | | | | | PHPBB3-9630
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| * | Merge remote-tracking branch 'p/ticket/10191' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/10191: [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
| | * | [ticket/10191] Use ob_get_level in exit_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling flush() when output buffering is enabled causes output to be duplicated. Besides phpBB enabling output buffering for gzip compression, output buffering may be enabled externally to phpBB via output_handler or output_buffering directives in php.ini. Use ob_get_level to determine whether output buffering is active and call ob_flush in that case. PHPBB3-10191
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
| * | | Merge remote-tracking branch 'p/ticket/10188' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * p/ticket/10188: [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
| | * | [ticket/10188] Use ob_get_level in msg_handler for output buffering check.Oleg Pudeyev2011-05-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output buffering may be enabled via various approaches, among them: * output_buffering in php.ini; * output_handler in php.ini enables output_buffering; * ob_start call. ob_get_level allows us to query php runtime for the actual output buffering status. PHPBB3-10188
* | | Merge remote-tracking branch 'p/ticket/10156' into developAndreas Fischer2011-05-231-2/+10
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/10156: [ticket/10156] Fix new cron on windows.
| * | | [ticket/10156] Fix new cron on windows.Oleg Pudeyev2011-05-191-2/+10
| | | | | | | | | | | | | | | | PHPBB3-10156
* | | | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-2017-2/+78
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8542: [ticket/8542] Display custom profile fields in private messages Conflicts: phpBB/install/database_update.php
| * | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-2017-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | Introduce an option to display the cpf in the PM view. PHPBB3-8542
* | | | Merge remote-tracking branch 'bantu/ticket/10173' into developOleg Pudeyev2011-05-153-10/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10173: [ticket/10173] Use correct variable, checking for $birthday_year was correct. [ticket/10173] Only calculate age if year is not false as per nn-. [ticket/10173] Use an array for the legacy birthday list as per rxu. [ticket/10173] Use a loop var for the birthdays list to allow proper templating
| * | | | [ticket/10173] Use correct variable, checking for $birthday_year was correct.Andreas Fischer2011-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10173
| * | | | [ticket/10173] Only calculate age if year is not false as per nn-.Andreas Fischer2011-05-081-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10173
| * | | | [ticket/10173] Use an array for the legacy birthday list as per rxu.Andreas Fischer2011-05-081-11/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10173
| * | | | [ticket/10173] Use a loop var for the birthdays list to allow proper templatingAndreas Fischer2011-05-083-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a loop variable for the list of birthdays to allow templates to handle how the list is displayed. We keep the old BIRTHDAY_LIST variable that contains the precompiled list around for backward compatibility. PHPBB3-10173
* | | | | Merge remote-tracking branch 'bantu/ticket/10146-develop' into developOleg Pudeyev2011-05-131-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10146-develop: [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
| * | | | | [ticket/10146] Fix Firebird DECIMAL precision issue on develop.Andreas Fischer2011-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10146
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-130-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0). Merged with -X ours, develop-olympus fix for PHPBB3-10146 does not apply to develop.
| * | | | | Merge remote-tracking branch 'bantu/ticket/10146' into develop-olympusOleg Pudeyev2011-05-131-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10146: [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
| | * | | | | [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).Andreas Fischer2011-04-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10146
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-131-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10186] UCP signature panel displays when not authed for signatures
| * | | | | | Merge remote-tracking branch 'p/ticket/10186' into develop-olympusAndreas Fischer2011-05-131-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10186: [ticket/10186] UCP signature panel displays when not authed for signatures
| | * | | | | | [ticket/10186] UCP signature panel displays when not authed for signaturesRMcGirr832011-05-121-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signature panel link was displayed even when a user did not have the auths to create/edit their signature. Clicking on the link gave a trigger_error of "Not authorised to have a signature". Hide the link when user does not have permissions to edit their signature. PHPBB3-10186
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-105-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
| * | | | | | Merge remote-tracking branch 'bantu/ticket/10126' into develop-olympusOleg Pudeyev2011-05-105-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10126: [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
| | * | | | | | [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.Andreas Fischer2011-05-115-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make what we want to achieve clear by using "and not" instead of "xor". PHPBB3-10126
* | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-102-7/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-102-7/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10170: [ticket/10170] Fix broken recaptcha verification host. [ticket/10170] Include www in hostname in language strings. [ticket/10170] Update language entries [ticket/10170] reCaptcha API has been moved.
| | * | | | | | [ticket/10170] Fix broken recaptcha verification host.Andreas Fischer2011-05-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10170
| | * | | | | | [ticket/10170] Include www in hostname in language strings.Andreas Fischer2011-05-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10170
| | * | | | | | [ticket/10170] Update language entriesErik Frèrejean2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the language entries to reflect the reCaptcha API change. PHPBB3-10170
| | * | | | | | [ticket/10170] reCaptcha API has been moved.Erik Frèrejean2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reCaptcha API has been moved from recaptcha.net to google.com/recaptcha. PHPBB3-10170
* | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-091-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympusOleg Pudeyev2011-05-091-6/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10154: [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
| | * | | | | | | [ticket/10154] Move "copy permissions from" to below "parent" on forum creationAndreas Fischer2011-05-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "copy permissions from" to below "parent forum" in forum creation form. PHPBB3-10154
* | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-093-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common. [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/9999' into develop-olympusOleg Pudeyev2011-05-093-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9999: [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common. [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| | * | | | | | [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-092-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9999
| | * | | | | | [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.Andreas Fischer2011-05-091-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | L_FORUM_FOLDER_ALT was supposed to be a language variable but the language variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead. Also, the expected functionality is correctly implemented by FORUM_FOLDER_IMG_ALT. PHPBB3-9999
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-081-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | * develop-olympus: [ticket/10178] Add path to find command to build packages on FreeBSD. [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
| * | | | | Merge remote-tracking branch 'p/ticket/10178' into develop-olympusAndreas Fischer2011-05-081-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10178: [ticket/10178] Add path to find command to build packages on FreeBSD.
| | * | | | | [ticket/10178] Add path to find command to build packages on FreeBSD.Oleg Pudeyev2011-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10178
| * | | | | | Merge remote-tracking branch 'p/ticket/10177' into develop-olympusAndreas Fischer2011-05-081-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10177: [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
| | * | | | | | [ticket/10177] Add `-f -` to tar command to build packages with bsdtar.Oleg Pudeyev2011-05-071-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10177
* | | | | | | Merge remote-tracking branch 'p/ticket/9693' into developAndreas Fischer2011-05-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9693: [ticket/9693] Removed useless $auth globalizations.
| * | | | | | | [ticket/9693] Removed useless $auth globalizations.Oleg Pudeyev2011-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9693
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-05-051-4/+258
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications. [ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools. [ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools. [ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools. [ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools. [ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools. [ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.