aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | [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 'github-noxwizard/ticket/10322' into developNils Adermann2011-09-188-16/+85
| |\ \ \
| | * | | [ticket/10322] Separate template varref resolution from output generationPatrick Webster2011-09-168-41/+75
| | * | | [ticket/10322] Dynamic template include testPatrick Webster2011-09-082-0/+10
| | * | | [ticket/10322] Fix dynamic template includesPatrick Webster2011-09-081-1/+26
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-171-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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 'VSEphpbb/ticket/10362' into developIgor Wiedler2011-09-1441-45/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10362] Revert subsilver2 changesMatt Friedman2011-09-137-10/+10
| * | | | [ticket/10362] HTML5 Fix - Replace name attribute with id in anchorsMatt Friedman2011-09-1148-55/+55
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10360' into developIgor Wiedler2011-09-144-17/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/10360] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-09-114-17/+25
|/ / / /
* | | | Merge remote-tracking branch 'bantu/ticket/10359' into developIgor Wiedler2011-09-081-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/10359] Also include utf_tools in style.php because of request class.Andreas Fischer2011-09-081-0/+1
* | | | Merge remote-tracking branch 'igorw/ticket/10359' into developAndreas Fischer2011-09-081-0/+4
|\ \ \ \ | |/ / /
| * | | [ticket/10359] Fix phpbb_request regression in download/file.phpIgor Wiedler2011-09-081-0/+4
|/ / /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-09-062-2/+3
|\ \ \ | |/ /
| * | 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 'igorw/ticket/10155' into developOleg Pudeyev2011-09-0514-0/+38
|\ \ \ \ \
| * | | | | [ticket/10155] Briefly explain assets in coding-guidelinesIgor Wiedler2011-07-171-1/+1
| * | | | | [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-1714-7/+14
| * | | | | [ticket/10155] Update to jQuery 1.6.2Igor Wiedler2011-07-121-3/+5
| * | | | | [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
| * | | | | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-1113-0/+28
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10350' into developOleg Pudeyev2011-09-052-1/+32
|\ \ \ \ \ \
| * | | | | | [ticket/10350] Script for testing eval rendererVjacheslav Trushkin2011-09-051-0/+31
| * | | | | | [ticket/10350] Fix for class phpbb_template_renderer_evalVjacheslav Trushkin2011-09-041-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-09-051-2/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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 branch 'develop-olympus' into developIgor Wiedler2011-09-053-0/+123
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 'p/ticket/10355' into developIgor Wiedler2011-09-051-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/10355] Correctly end output buffering in template tests.Oleg Pudeyev2011-09-051-2/+16
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/9474' into developOleg Pudeyev2011-09-052-105/+0
|\ \ \ \ \ \ \ \