aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-1/+1
|\ | | | | | | | | * develop-olympus: [ticket/10204] Detect binary file changes in dirs with names containing dots
| * Merge remote-tracking branch 'naderman/ticket/10204' into develop-olympusAndreas Fischer2011-06-091-1/+1
| |\ | | | | | | | | | | | | * naderman/ticket/10204: [ticket/10204] Detect binary file changes in dirs with names containing dots
| | * [ticket/10204] Detect binary file changes in dirs with names containing dotsNils Adermann2011-06-091-1/+1
| | | | | | | | | | | | PHPBB3-10204
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
| * | Merge remote-tracking branch 'nickvergessen/ticket/10203' into develop-olympusAndreas Fischer2011-06-091-2/+2
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/10203: [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067
| | * | [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067Joas Schilling2011-06-091-2/+2
| | |/ | | | | | | | | | PHPBB3-10203
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-062-10/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10067] Add separator to h_radio to place options on individual lines Conflicts: phpBB/adm/index.php
| * | Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympusAndreas Fischer2011-06-062-10/+11
| |\ \ | | |/ | |/| | | | | | | * naderman/ticket/10067: [ticket/10067] Add separator to h_radio to place options on individual lines
| | * [ticket/10067] Add separator to h_radio to place options on individual linesNils Adermann2011-06-052-10/+11
| | | | | | | | | | | | | | | | | | | | | The previous mechanism for account activation resulted in two h_radio calls with identical id attributes for two elements. PHPBB3/10067
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-053-1/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required. [ticket/10042] GD CAPTCHA: Round offset to the next pixel. [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
| * | Merge branch 'ticket/bantu/10042' into develop-olympusNils Adermann2011-06-053-1/+63
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10042: [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required. [ticket/10042] GD CAPTCHA: Round offset to the next pixel. [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.
| | * | [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.Andreas Fischer2011-03-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10042
| | * | [ticket/10042] GD CAPTCHA: Round offset to the next pixel.Andreas Fischer2011-03-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10042
| | * | [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.Andreas Fischer2011-03-052-0/+62
| | | | | | | | | | | | | | | | PHPBB3-10042
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/9922] Link post subject to the post's anchor in subsilver2.
| * | | Merge branch 'ticket/bantu/9922' into develop-olympusNils Adermann2011-06-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9922: [ticket/9922] Link post subject to the post's anchor in subsilver2.
| | * | | [ticket/9922] Link post subject to the post's anchor in subsilver2.Andreas Fischer2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link post subject to the post's anchor in subsilver2 to expose full URL to post which is otherwise only hidden behind the small post icon. PHPBB3-9922
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-052-7/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10067] Clarify language for user activation options in ACP.
| * | | | Merge branch 'ticket/p/10067' into develop-olympusNils Adermann2011-06-052-7/+13
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * ticket/p/10067: [ticket/10067] Clarify language for user activation options in ACP.
| | * | | [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-302-7/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10067
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-054-7/+35
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * | | | Merge branch 'ticket/nickvergessen/10158' into develop-olympusNils Adermann2011-06-053-7/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/10158: [ticket/10158] Remove some code duplication from generating the message. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| | * | | | [ticket/10158] Remove some code duplication from generating the message.Nils Adermann2011-06-051-28/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-232-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Add return-link to folder, when the user replied from a folder.Joas Schilling2011-05-092-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| | * | | | [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10158
| * | | | | Merge branch 'ticket/bantu/10195' into develop-olympusNils Adermann2011-06-051-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10195: [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
| | * | | | | [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.Andreas Fischer2011-05-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no support for IPv6 addresses in the blacklists we check right now. PHPBB3-10195
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-031-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
| * | | | | | Merge remote-tracking branch 'naderman/ticket/10149' into develop-olympusAndreas Fischer2011-06-031-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10149: [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalar
| | * | | | | | [ticket/10149] Skip foreach over GLOBALS cookie values if cookie is scalarNils Adermann2011-06-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10149
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-031-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9950] Use actual language instead of user's language in overall header
| * | | | | | | Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympusAndreas Fischer2011-06-031-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/9950: [ticket/9950] Use actual language instead of user's language in overall header
| | * | | | | | | [ticket/9950] Use actual language instead of user's language in overall headerNils Adermann2011-06-021-2/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9950
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-023-2/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9685] Test for databases that are able to nest transactions [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
| * | | | | | | Merge remote-tracking branch 'naderman/ticket/9685' into develop-olympusAndreas Fischer2011-06-023-2/+26
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/9685: [ticket/9685] Test for databases that are able to nest transactions [ticket/9685] Consistently name the new sql_buffer_nested_transactions function
| | * | | | | | [ticket/9685] Test for databases that are able to nest transactionsNils Adermann2011-06-021-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a database is unable to nest transactions the dbal should implement sql_buffer_nested_transactions to signal that buffering of the outer results and closing of the outer transaction is required to open the inner transaction. PHPBB3-9685
| | * | | | | | [ticket/9685] Consistently name the new sql_buffer_nested_transactions functionNils Adermann2011-06-022-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9685
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-021-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
| * | | | | | Merge branch 'ticket/p/10039' into develop-olympusNils Adermann2011-06-021-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * ticket/p/10039: [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
| | * | | | | [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.Patrick Webster2011-05-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10039
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10192] Add missing semicolon
| * | | | | | Merge remote-tracking branch 'erikfrerejean/ticket/10192' into develop-olympusAndreas Fischer2011-05-231-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * erikfrerejean/ticket/10192: [ticket/10192] Add missing semicolon
| | * | | | | | [ticket/10192] Add missing semicolonErik Frèrejean2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the index has to be recreated it will run into the private message table query. PHPBB3-10192
* | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 20:09:48 +0000