aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-11-291-2/+2
|\
| * Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-291-2/+2
| |\
| | * Merge remote-tracking branch 'nickvergessen/ticket/10501' into prep-release-3...Andreas Fischer2011-11-291-2/+2
| | |\
| | | * [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-281-1/+0
| |\ \ \ | | |/ /
| | * | [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-0/+8
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-0/+8
| |\ \ | | |/
| | * [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.Andreas Fischer2011-11-271-0/+8
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-5/+5
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
| |\ \ | | |/
| | * Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| | |\
| | | * [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-261-0/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-261-0/+7
| |\ \ \ | | |/ /
| | * | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-263-3/+10
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ \ \ | |/ /
| * | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| * | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-244-17/+25
| |\ \ | | |/
| | * Merge remote-tracking branch 'nickvergessen/ticket/10485' into prep-release-3...Oleg Pudeyev2011-11-244-17/+25
| | |\
| | | * [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-247-38/+47
|\ \ \ \
| * | | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-217-38/+47
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+6
| | |\ \ \
| | | * | | [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.Andreas Fischer2011-11-231-1/+6
| | | | |/ | | | |/|
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+5
| | |\ \ \
| | | * | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | * | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | |/ /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/10479' into prep-release-3...Oleg Pudeyev2011-11-231-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/10479] Remove PostgreSQL version numbers from driver's language stringJoas Schilling2011-11-211-1/+1
* | | | | Merge remote-tracking branch 'igorw/ticket/10323' into developOleg Pudeyev2011-11-201-4/+9
|\ \ \ \ \
| * | | | | [ticket/10323] slight potential performance improvementIgor Wiedler2011-11-201-4/+4
| * | | | | [ticket/10323] make finder work with PHP 5.2Igor Wiedler2011-11-191-1/+6
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-213-22/+150
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-213-3/+3
| | |/ / / | |/| | |
| * | | | [develop-olympus] Add changelog for 3.0.10-RC1Igor Wiedler2011-11-211-18/+144
| * | | | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-203-5/+7
| * | | | [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-2010-11/+11
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-2010-48/+28
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-2010-15/+18
| * | | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| * | | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| * | | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-2010-50/+26