aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-cs278/ticket/10374' into developNils Adermann2011-09-211-1/+1
|\
| * [ticket/10374] Remove 'custom template' cache prefix.Chris Smith2011-09-201-1/+1
* | Merge remote-tracking branch 'github-cyberalien/ticket/10371' into developNils Adermann2011-09-202-15/+1
|\ \ | |/ |/|
| * [ticket/10371] Removing last mentions of imagesetVjacheslav Trushkin2011-09-202-15/+1
|/
* Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' int...Nils Adermann2011-09-20210-2294/+1558
|\
| * [feature/remove-imagesets] Script for converting imageset to cssVjacheslav Trushkin2011-09-041-0/+274
| * [feature/remove-imagesets] Changing subsilverVjacheslav Trushkin2011-09-0421-55/+598
| * [feature/remove-imagesets] Changing prosilverVjacheslav Trushkin2011-09-0410-154/+617
| * [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-0412-342/+16
| * [feature/remove-imagesets] Changing admin control panel styles moduleVjacheslav Trushkin2011-09-035-985/+33
| * [feature/remove-imagesets] Changing database structureVjacheslav Trushkin2011-09-0312-460/+20
| * [feature/remove-imagesets] Removing imageset filesVjacheslav Trushkin2011-09-036-298/+0
| * [feature/remove-imagesets] Moving imagesVjacheslav Trushkin2011-09-03143-0/+0
* | Merge branch 'develop-olympus' into developNils Adermann2011-09-191-37/+20
|\ \
| * \ 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 branch 'develop-olympus' into developNils Adermann2011-09-181-5/+21
|\ \ \ | |/ /
| * | 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 branch 'develop-olympus' into developNils Adermann2011-09-183-8/+67
|\ \ \ \ | |/ / /
| * | | 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 '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 '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
| |\ \ \