aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-163-9/+31
|\
| * 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 branch 'develop-olympus' into developNils Adermann2011-07-161-1/+17
|\ \ \ | |/ /
| * | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-0/+8
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-0/+21
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-161-24/+58
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch 'develop-olympus' into developNils Adermann2011-07-166-22/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-072-1/+37
|\ \ \ \ | |/ / /
| * | | 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 'develop-olympus' into developNils Adermann2011-07-062-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 'develop-olympus' into developAndreas Fischer2011-07-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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 'develop-olympus' into developAndreas Fischer2011-06-261-16/+15
|\ \ \ \ | |/ / /
| * | | 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 'develop-olympus' into developNils Adermann2011-06-261-0/+28
|\ \ \ \ | |/ / /
| * | | 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 'develop-olympus' into developNils Adermann2011-06-201-1/+2
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-06-201-1/+2
| |\ \ | | |/
| | * [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"Andreas Fischer2011-06-201-1/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-191-3/+6
|\ \ \ | |/ /