aboutsummaryrefslogtreecommitdiff
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [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 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 '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 '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
* | | [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
* | [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
* | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
|\ \
| * | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
* | | Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympusOleg Pudeyev2011-11-191-2/+2
|\ \ \
| * | | [ticket/8599] Added ability to select all to add multiple smilies screen.callumacrae2011-08-241-2/+2
* | | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-192-3/+7
|\ \ \ \
| * | | | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| * | | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-212-1/+6
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympusOleg Pudeyev2011-11-193-116/+129
|\ \ \ \ \
| * | | | | [ticket/8996] Also fix the BBCode bug in subsilver2 and acpJoas Schilling2011-11-183-108/+117
| * | | | | [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskeyJoas Schilling2011-10-291-11/+15
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-...Nils Adermann2011-11-182-4/+21
|\ \ \ \ \ \
| * | | | | | [ticket/9776] Delete poll if no poll options were submitted.Joas Schilling2011-11-182-4/+21
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-...Nils Adermann2011-11-183-1/+5
|\ \ \ \ \ \
| * | | | | | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-143-1/+5
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympusNils Adermann2011-11-181-3/+3
|\ \ \ \ \ \
| * | | | | | [ticket/9416] HTML entities in poll titles and options incorrectly re-encodedrxu2011-11-171-3/+3
* | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop...Nils Adermann2011-11-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracledmauri2011-11-151-1/+1
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympusAndreas Fischer2011-11-181-12/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/10185] Always set board startdate on conversionJoas Schilling2011-11-151-12/+9
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympusJoas Schilling2011-11-181-3/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ticket/9008] Incorrect unread topic tracking for unapproved topicsrxu2011-09-251-3/+9
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-172-1/+9
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-172-1/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-153-0/+51
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| * | | | | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-052-8/+8
| * | | | | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-183-0/+51
| | |_|_|_|_|/ | |/| | | | |