aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-165-3/+73
|\ \ \
| * | | [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().Andreas Fischer2011-07-131-0/+49
| * | | [ticket/10243] Call phpbb_gmgetdate() from various places.Andreas Fischer2011-07-133-3/+3
| * | | [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-164-25/+67
|\ \ \ \
| * | | | [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-114-18/+46
| * | | | [ticket/10237] Use confirm-box to handle unwatching a forum/topic actionsJoas Schilling2011-07-072-9/+23
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/7291' into develop-...Nils Adermann2011-07-163-37/+37
|\ \ \ \ \
| * | | | | [ticket/7291] Use template loop for character list, to avoid double &first_charJoas Schilling2011-07-143-37/+37
| | |_|/ / | |/| | |
* | | | | 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 remote-tracking branch 'github-bantu/ticket/10208' into develop-olympusNils Adermann2011-07-151-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/10208] Explain what happens when 'Warning duration' is set to 0.Tabitha Backoff2011-07-161-1/+1
|/ / / /
* | | | Merge remote branch 'remotes/callumacrae/ticket/10216' into develop-olympusJoas Schilling2011-07-141-1/+1
|\ \ \ \
| * | | | [ticket/10216] Fixed a grammar error in SOME_QUERIES_FAILED.Callum Macrae2011-07-141-1/+1
| |/ / /
* | | | Merge remote branch 'remotes/bantu/ticket/10267' into develop-olympusJoas Schilling2011-07-141-2/+2
|\ \ \ \
| * | | | [ticket/10267] Call strlen() on $table_prefix for $max_length calculation.Andreas Fischer2011-07-141-2/+2
| |/ / /
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10255' into develop-olympusAndreas Fischer2011-07-141-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10255] Add leading slash in gitignore to only ignore specified filesJoas Schilling2011-07-141-11/+11
|/ / /
* | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-102-2/+8
|\ \ \
| * | | [prep-release-3.0.9] Bumping version number for 3.0.9 final.Andreas Fischer2011-07-104-5/+11
* | | | Merge remote-tracking branch 'p/ticket/10003' into develop-olympusAndreas Fischer2011-07-091-2242/+5
|\ \ \ \
| * | | | [ticket/10003] Fixed comment referring to db_tools duplication.Oleg Pudeyev2011-07-091-2/+2
| * | | | [ticket/10003] Require db_tools.php in database_update.php.Oleg Pudeyev2011-07-091-0/+2
| * | | | [ticket/10003] Use phpbb_db_tools in database_update.php.Oleg Pudeyev2011-07-091-1/+1
| * | | | [ticket/10003] Delete the copy of db_tools in database_update.php.Oleg Pudeyev2011-07-091-2239/+0
|/ / / /
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-073-3/+5
|\ \ \ \ | |/ / /
| * | | [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.Andreas Fischer2011-07-071-0/+2
| * | | [prep-release-3.0.9] Decreasing version for an RC4 release.Andreas Fischer2011-07-074-6/+6
* | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-073-1/+37
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'naderman/ticket/10250' into prep-release-3.0.9Andreas Fischer2011-07-073-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
| | * | | [ticket/10250] Added the new phpBB Logo with the Registered Trademark SymbolSam Thompson2011-07-051-0/+0
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusNils Adermann2011-07-0616-18/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/marshalrusty/9859' into prep-release-3.0.9Nils Adermann2011-07-0616-18/+18
| |\ \ \ \
| | * | | | [ticket/9859] Changing all phpBB footers to match the new credit lineYuriy Rusko2011-07-0615-17/+17
| | * | | | [ticket/9859] New footer copyright line with registered symbolYuriy Rusko2011-07-061-1/+1
| |/ / / /
* | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-061-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10247' into prep-release-3...Andreas Fischer2011-07-061-1/+1
| |\ \ \
| | * | | [ticket/10247] Remove attempt_id as primary key from database_update.phpJoas Schilling2011-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
| |\ \ \