aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | [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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-07-141-12/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 remote-tracking branch 'igorw/ticket/7090' into developAndreas Fischer2011-07-137-13/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/7090] Update documented minimum PHP version to 5.2.0Igor Wiedler2011-07-137-13/+12
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-102-2/+8
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-olympus' into developAndreas Fischer2011-07-091-2242/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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 'develop-olympus' into developAndreas Fischer2011-07-073-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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 '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
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 'develop-olympus' into developAndreas Fischer2011-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 '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-0512-58/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-07-0512-58/+42
| |\ \ \ \ \ | | |/ / / /
| | * | | | [prep-release-3.0.9] Update Changelog for 3.0.9 release.Andreas Fischer2011-07-051-0/+2