aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-163-37/+37
|\
| * 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 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 developNils 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-tracking branch 'igorw/ticket/10260' into developAndreas Fischer2011-07-161-0/+0
|\ \ \
| * | | [ticket/10260] Remove the icon_fontsize.gif image (thanks Vinny)Igor Wiedler2011-07-151-0/+0
* | | | Merge branch 'ticket/igorw/10260' into developNils Adermann2011-07-159-231/+2
|\ \ \ \ | |/ / /
| * | | [ticket/10260] Remove prosilver styleswitcherIgor Wiedler2011-07-129-231/+2
* | | | Merge branch 'develop-olympus' into developJoas Schilling2011-07-141-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 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
| |/ /
* | | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-137-13/+12
| |/ |/|
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-101-0/+6
|\ \ | |/
| * Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-101-0/+6
| |\
| | * [prep-release-3.0.9] Bumping version number for 3.0.9 final.Andreas Fischer2011-07-103-3/+9
* | | Merge branch 'develop-olympus' into developAndreas 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 'develop-olympus' into developAndreas Fischer2011-07-072-2/+4
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-072-2/+4
| |\ \ | | |/
| | * [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-073-5/+5
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-073-1/+37
|\ \ \ | |/ /
| * | 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 'develop-olympus' into developNils Adermann2011-07-0616-18/+18
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusNils 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 'develop-olympus' into developAndreas Fischer2011-07-061-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-061-1/+1
| |\ \ \ | | |/ /
| | * | [ticket/10247] Remove attempt_id as primary key from database_update.phpJoas Schilling2011-07-051-1/+1
* | | | 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
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-0510-54/+30
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-0510-54/+30
| |\ \ \ \ | | |/ / /