aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympusOleg Pudeyev2011-08-071-0/+7
|\
| * [ticket/8937] Keep space characters in front of [code] bbcode contentNils Adermann2011-07-171-0/+7
* | Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympusOleg Pudeyev2011-08-041-1/+1
|\ \
| * | [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()Andreas Fischer2011-07-311-1/+1
* | | [ticket/10303] Removed HTTP_VERSION code path from send_status_line().Chris Smith2011-08-051-6/+0
|/ /
* | Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympusOleg Pudeyev2011-07-301-0/+8
|\ \
| * | [ticket/9645] Added code to repair invalid anchor names in acp_php_info.Callum Macrae2011-07-281-0/+8
* | | Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympusAndreas Fischer2011-07-301-2/+2
|\ \ \ | |_|/ |/| |
| * | [ticket/10263] Fix comment about return value of phpbb_version_compare().Andreas Fischer2011-07-271-2/+2
* | | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
|\ \ \
| * | | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| * | | [ticket/10257] Fix AAAA record parsing for old versions of WindowsPatrick Webster2011-07-131-1/+6
| * | | [ticket/10257] Add missing break statement after CNAME block.Andreas Fischer2011-07-131-0/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \
| * | | [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
| |/ /
* | | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-163-9/+31
|\ \ \ | | |/ | |/|
| * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| * | [ticket/10263] Add wrapper for version_compare() that allows the use of A and BAndreas Fischer2011-07-131-0/+28
| |/
* | Merge remote-tracking branch 'github-rxu/ticket/10226' into develop-olympusNils Adermann2011-07-161-1/+17
|\ \
| * | [ticket/10226] Use is_numeric() instead of preg_replace()rxu2011-06-211-1/+1
| * | [ticket/10226] Allow mysqli connections via local sockets/pipesrxu2011-06-211-1/+17
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/10252' into develop...Nils Adermann2011-07-161-0/+8
|\ \ \
| * | | [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permissionJoas Schilling2011-07-151-0/+8
* | | | Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympusNils Adermann2011-07-161-0/+21
|\ \ \ \
| * | | | [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.Andreas Fischer2011-07-121-0/+21
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10237' into develop...Nils Adermann2011-07-161-23/+57
|\ \ \ \
| * | | | [ticket/10237] Also display login-box on subscribingJoas Schilling2011-07-111-1/+1
| * | | | [ticket/10237] Handle watching and unwatching the same way.Joas Schilling2011-07-111-16/+38
| * | | | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-071-9/+21
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/5506' into develop-...Nils Adermann2011-07-166-22/+39
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-146-22/+39
| | |/ / | |/| |
* | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
|/ / /
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-072-1/+37
|\ \ \
| * \ \ Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-072-1/+37
| |\ \ \
| | * | | [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | * | | [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
| | * | | [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-062-2/+2
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-062-2/+2
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-051-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'naderman/ticket/10247' into prep-release-3.0.9Andreas Fischer2011-07-051-1/+1
| |\ \ \
| | * | | [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id)Nils Adermann2011-07-041-1/+1
| | |/ /
| * | | [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-051-1/+1
| |/ /
| * | [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-261-1/+1
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-16/+15
|\ \ \ | |/ /
| * | [ticket/10188] Prevent semi-compressed outputNils Adermann2011-06-261-16/+15
* | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-261-0/+28
|\ \ \ | |/ / | | / | |/ |/|
| * [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.Andreas Fischer2011-06-251-0/+28
* | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-201-1/+2
|\ \ | |/