aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympusAndreas Fischer2011-10-131-1/+1
|\
| * [ticket/10400] Allow forum name to be '0'Joas Schilling2011-10-071-1/+1
* | Merge remote-tracking branch 'remotes/cyberalien/ticket/10397' into develop-o...Joas Schilling2011-10-132-3/+3
|\ \
| * | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-1/+1
| * | [ticket/10397] Pagination inconsistency fixVjacheslav Trushkin2011-10-041-2/+2
|/ /
* | Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-271-2/+2
|\ \
| * | [ticket/10394] Use call_user_func_array to pass a ref into a dynamic functionNils Adermann2011-09-271-2/+2
* | | Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympusAndreas Fischer2011-09-271-5/+3
|\ \ \
| * | | [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlappingJoas Schilling2011-09-211-5/+3
* | | | Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympusAndreas Fischer2011-09-272-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4Nils Adermann2011-09-272-3/+3
|/ / /
* | | Merge remote-tracking branch 'github-bantu/ticket/10370' into develop-olympusNils Adermann2011-09-191-37/+20
|\ \ \
| * | | [ticket/10370] Add function documentation for get_stacktrace().Andreas Fischer2011-09-191-1/+6
| * | | [ticket/10370] Explain that we are not the ones hiding backtrace pieces.Andreas Fischer2011-09-191-2/+3
| * | | [ticket/10370] Call htmlspecialchars() after phpbb_filter_root_path().Andreas Fischer2011-09-191-2/+1
| * | | [ticket/10370] Add require_once to whitelisted functions.Andreas Fischer2011-09-191-1/+1
| * | | [ticket/10370] Use single string instead of an array for arguments.Andreas Fischer2011-09-191-3/+3
| * | | [ticket/10370] Ease up code checking for arguments of include etc.Andreas Fischer2011-09-191-14/+7
| * | | [ticket/10370] Use unset() on the first backtrace instead of checking in loop.Andreas Fischer2011-09-191-7/+4
| * | | [ticket/10370] Use phpbb_filter_root_path() in get_backtrace().Andreas Fischer2011-09-191-14/+2
|/ / /
* | | Merge remote-tracking branch 'github-bantu/ticket/10245' into develop-olympusNils Adermann2011-09-181-5/+21
|\ \ \
| * | | [ticket/10245] Use error_collector instead of ob_start() and ob_get_clean().Andreas Fischer2011-09-181-5/+21
* | | | Merge remote-tracking branch 'github-bantu/ticket/10369' into develop-olympusNils Adermann2011-09-183-8/+67
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10369] Replace root path with "[ROOT]" as per IRC.Andreas Fischer2011-09-181-1/+1
| * | | [ticket/10369] Add warning about paths outside of phpBB root not being filteredAndreas Fischer2011-09-181-0/+2
| * | | [ticket/10369] Rename filter_errfile() to filter_root_path().Andreas Fischer2011-09-182-4/+4
| * | | [ticket/10369] DRY code to remove phpbb path from errfile.Andreas Fischer2011-09-182-6/+24
| * | | [ticket/10369] Always include errfile and errline in format_errors().Andreas Fischer2011-09-182-5/+44
|/ / /
* | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10324' into develop-oly...Andreas Fischer2011-09-171-1/+1
|\ \ \ | |_|/ |/| |
| * | [ticket/10324] Fixed XHTML validity error in User Notes Prosilver themegalaxyAbstractor2011-09-171-1/+1
|/ /
* | Merge remote-tracking branch 'bantu/ticket/10294' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ \
| * | [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.Andreas Fischer2011-07-281-1/+1
* | | Merge remote-tracking branch 'Noxwizard/ticket/10351' into develop-olympusAndreas Fischer2011-09-061-1/+1
|\ \ \
| * | | [ticket/10351] Fix Oracle's sql_column_remove()Patrick Webster2011-09-041-1/+1
* | | | Merge remote-tracking branch 'Noxwizard/ticket/10352' into develop-olympusAndreas Fischer2011-09-061-0/+1
|\ \ \ \
| * | | | [ticket/10352] Add missing break for Oracle's sql_table_drop()Patrick Webster2011-09-041-0/+1
| |/ / /
* | | | Merge remote-tracking branch 'p/ticket/10354' into develop-olympusIgor Wiedler2011-09-051-2/+3
|\ \ \ \
| * | | | [ticket/10354] Include cache directory path in unwritable message.Oleg Pudeyev2011-09-051-2/+3
* | | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusIgor Wiedler2011-09-053-0/+123
|\ \ \ \ \
| * | | | | [ticket/10240] Added optionset to mock_user in the tests.Callum Macrae2011-08-232-6/+12
| * | | | | [ticket/10240] Fixed copyright year in censor_text_test.php.Callum Macrae2011-08-231-1/+1
| * | | | | [ticket/10240] Fixed censor_text test assetEquals param order.Callum Macrae2011-08-231-1/+1
| * | | | | [ticket/10240] Added censor_text tests for special characters.Callum Macrae2011-08-231-0/+10
| * | | | | [ticket/10240] Added censor_text tests.Callum Macrae2011-08-223-0/+107
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympusOleg Pudeyev2011-09-052-0/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ticket/10321] Add descriptions to the unit testsJoas Schilling2011-08-211-15/+15
| * | | | | [ticket/10321] Do not append the ? if the param-list is empty anyway.Joas Schilling2011-08-212-0/+57
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympusAndreas Fischer2011-08-301-1/+0
|\ \ \ \ \ \
| * | | | | | [ticket/10339] Remove invalid template loop variable from mcp_front.htmlJoas Schilling2011-08-241-1/+0
| |/ / / / /
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympusAndreas Fischer2011-08-301-1/+1
|\ \ \ \ \ \