aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10155] Move jQuery inclusion to footerIgor Wiedler2011-07-1714-7/+14
* [ticket/10155] Update to jQuery 1.6.2Igor Wiedler2011-07-121-3/+5
* [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
* [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-1113-0/+28
* 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
| |\ \ \ \ | | |/ / /
| | * | | [prep-release-3.0.9] Update Changelog for 3.0.9 release.Andreas Fischer2011-07-051-0/+2
| | * | | [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.Andreas Fischer2011-07-053-5/+5
| | |/ /
| | * | [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.Nils Adermann2011-07-041-10/+9
| | * | [ticket/10247] Add empty data section to database update for RC4Nils Adermann2011-07-031-0/+4
| | * | [ticket/10247] Remove unecessary attempt_id primary key columnNils Adermann2011-07-039-54/+13
| | |/
| | * [prep-release-3.0.9] Bump database version to RC3 too.Andreas Fischer2011-06-261-1/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-1/+25
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-1/+25
| |\ \ | | |/
| | * [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.Andreas Fischer2011-06-261-1/+25
| | * [prep-release-3.0.9] Bumping version number for 3.0.9-RC3.Andreas Fischer2011-06-263-2/+8
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-261-1/+1
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.9' into develop-olympusAndreas Fischer2011-06-261-1/+1
| |\ \ | | |/
| | * Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9Andreas Fischer2011-06-261-1/+1
| | |\
| | | * [ticket/10233] IE Emulation fix breaks PM posting layoutRaimon2011-06-261-1/+1