| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into ↵ | Nils Adermann | 2011-10-14 | 1 | -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 No | Joas Schilling | 2011-10-14 | 1 | -1/+1 |
| | | | | | | | | | PHPBB3-10074 | ||||
| * | | Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympus | Nils Adermann | 2011-10-14 | 1 | -1/+8 |
| |\ \ | | | | | | | | | | | | | * github-bantu/ticket/10187: [ticket/10187] XHTML fix for empty groups in UCP. | ||||
| | * | | [ticket/10187] XHTML fix for empty groups in UCP. | Andreas Fischer | 2011-10-13 | 1 | -1/+8 |
| | | | | | | | | | | | | | PHPBB3-10187 | ||||
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus | Nils Adermann | 2011-10-14 | 3 | -2/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Fischer | 2011-10-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-10278 | ||||
| | * | | | [ticket/10278] Also timeout when receiving data over a slow connection. | Andreas Fischer | 2011-10-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-10278 | ||||
| | * | | | [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds. | Andreas Fischer | 2011-08-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-10278 | ||||
| | * | | | [ticket/10278] Return with a timeout error when fread() or fgets() time out. | Andreas Fischer | 2011-08-25 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | | PHPBB3-10278 | ||||
| | * | | | [ticket/10278] Also set timeout on stream in get_remote_file(). | Andreas Fischer | 2011-08-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the PHP manual for fsockopen(): If you need to set a timeout for reading/writing data over the socket, use stream_set_timeout(), as the timeout parameter to fsockopen() only applies while connecting the socket. http://www.php.net/manual/en/function.fsockopen.php PHPBB3-10278 | ||||
| * | | | | Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+7 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | * igorw/ticket/10307: [ticket/10307] Add a test for PHPBB3-10307 [ticket/10307] Return false in mysqli sql_fetchrow on empty result | ||||
| | * | | | [ticket/10307] Return false in mysqli sql_fetchrow on empty result | Igor Wiedler | 2011-10-13 | 1 | -1/+7 |
| | | |/ | |/| | | | | | | | PHPBB3-10307 | ||||
| * | | | [ticket/10246] Move coding guidelines VCS section to wiki | Igor Wiedler | 2011-10-13 | 1 | -51/+1 |
| | | | | | | | | | | | | | | | | | | | | | | The VCS section can now be found at: * http://wiki.phpbb.com/Git#Branches PHPBB3-10246 | ||||
| * | | | Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * igorw/ticket/8094: [ticket/8094] Remove ambiguity of "phpBB has no categories" | ||||
| | * | | | [ticket/8094] Remove ambiguity of "phpBB has no categories" | Igor Wiedler | 2011-10-13 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | PHPBB3-8094 | ||||
| * | | | Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * igorw/ticket/10275: [ticket/10275] Remove incorrect password information from FAQ | ||||
| | * | | | [ticket/10275] Remove incorrect password information from FAQ | Igor Wiedler | 2011-10-13 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | FAQ contains instructions to find the password in the registration e-mail. We no longer send the password on registration. So let's just remove this incorrect piece of information from the FAQ. PHPBB3-10275 | ||||
| * | | | Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * igorw/ticket/9898: [ticket/9898] Encourage patches in README | ||||
| | * | | | [ticket/9898] Encourage patches in README | Igor Wiedler | 2011-10-13 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | PHPBB3-9898 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympus | Andreas Fischer | 2011-10-13 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10408: [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP | ||||
| | * | | | [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP | Joas Schilling | 2011-10-13 | 2 | -3/+3 |
| | |/ / | | | | | | | | | | PHPBB3-10408 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10304: [ticket/10304] Fix URL for ICQ while view private messages | ||||
| | * | | | [ticket/10304] Fix URL for ICQ while view private messages | Joas Schilling | 2011-10-13 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | PHPBB3-10304 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus | Andreas Fischer | 2011-10-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10400: [ticket/10400] Allow forum name to be '0' | ||||
| | * | | | [ticket/10400] Allow forum name to be '0' | Joas Schilling | 2011-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-10400 | ||||
| * | | | | [ticket/10397] Pagination inconsistency fix | Vjacheslav Trushkin | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixing topic_generate_pagination() PHPBB3-10397 | ||||
| * | | | | [ticket/10397] Pagination inconsistency fix | Vjacheslav Trushkin | 2011-10-04 | 1 | -2/+2 |
| | |/ / |/| | | | | | | | | | | | | | | Fixing inconsistency in code generated by generate_pagination() PHPBB3-10397 | ||||
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus | Andreas Fischer | 2011-09-27 | 1 | -5/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10315: [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping | ||||
| | * | | | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping | Joas Schilling | 2011-09-21 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-10315 | ||||
| * | | | | [ticket/10370] Add function documentation for get_stacktrace(). | Andreas Fischer | 2011-09-19 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Explain that we are not the ones hiding backtrace pieces. | Andreas Fischer | 2011-09-19 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Taken from 2db54cf7e809e731e4440377bcc06e2aa05f190d. PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path(). | Andreas Fischer | 2011-09-19 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Add require_once to whitelisted functions. | Andreas Fischer | 2011-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Use single string instead of an array for arguments. | Andreas Fischer | 2011-09-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Ease up code checking for arguments of include etc. | Andreas Fischer | 2011-09-19 | 1 | -14/+7 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Use unset() on the first backtrace instead of checking in loop. | Andreas Fischer | 2011-09-19 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | [ticket/10370] Use phpbb_filter_root_path() in get_backtrace(). | Andreas Fischer | 2011-09-19 | 1 | -14/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-10370 | ||||
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympus | Nils Adermann | 2011-09-18 | 1 | -5/+21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10245: [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean(). | ||||
| | * | | | | [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean(). | Andreas Fischer | 2011-09-18 | 1 | -5/+21 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10245 | ||||
| * | | | | | [ticket/10369] Replace root path with "[ROOT]" as per IRC. | Andreas Fischer | 2011-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10369 | ||||
| * | | | | | [ticket/10369] Add warning about paths outside of phpBB root not being filtered | Andreas Fischer | 2011-09-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10369 | ||||
| * | | | | | [ticket/10369] Rename filter_errfile() to filter_root_path(). | Andreas Fischer | 2011-09-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10369 | ||||
| * | | | | | [ticket/10369] DRY code to remove phpbb path from errfile. | Andreas Fischer | 2011-09-18 | 2 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10369 | ||||
| * | | | | | [ticket/10369] Always include errfile and errline in format_errors(). | Andreas Fischer | 2011-09-18 | 1 | -5/+9 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We remove the phpBB root path from errfile. This is consistent with how msg_handler handles E_WARNING messages etc. PHPBB3-10369 | ||||
| * | | | | [ticket/10324] Fixed XHTML validity error in User Notes Prosilver theme | galaxyAbstractor | 2011-09-17 | 1 | -1/+1 |
| | |/ / |/| | | | | | | | | | | | | | | Replaced the deprecated align and width attributes with CSS. PHPBB3-10324 | ||||
| * | | | Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympus | Andreas Fischer | 2011-09-06 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | * bantu/ticket/10294: [ticket/10294] Fix sql_affectedrows() in mssqlnative driver. | ||||
| | * | | | [ticket/10294] Fix sql_affectedrows() in mssqlnative driver. | Andreas Fischer | 2011-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | sqlsrv_rows_affected() expects a statement resource, not a connection resource. PHPBB3-10294 | ||||
| * | | | | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympus | Andreas Fischer | 2011-09-06 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10351: [ticket/10351] Fix Oracle's sql_column_remove() | ||||
| | * | | | | [ticket/10351] Fix Oracle's sql_column_remove() | Patrick Webster | 2011-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct syntax is DROP COLUMN. PHPBB3-10351 | ||||
| * | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympus | Andreas Fischer | 2011-09-06 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10352: [ticket/10352] Add missing break for Oracle's sql_table_drop() | ||||
