aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
|\
| * Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3...Andreas Fischer2011-12-161-2/+16
| |\
| | * [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
* | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-091-1/+10
|\ \ \ | |/ /
| * | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10
| * | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-1/+1
| |/
* | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-032-46/+8
|\ \
| * | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| * | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-282-46/+9
* | | 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
| * | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-1/+1
| |/ /
* | | [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-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
* | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-211-1/+1
|/ /
* | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-1/+1
* | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-208-13/+16
* | [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-208-42/+24
* | 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 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
|\ \ \
| * | | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| * | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-...Nils Adermann2011-11-181-4/+4
|\ \ \ \
| * | | | [ticket/9776] Delete poll if no poll options were submitted.Joas Schilling2011-11-181-4/+4
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-...Nils Adermann2011-11-181-0/+3
|\ \ \ \ \
| * | | | | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-141-0/+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 '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-171-1/+8
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-1/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+11
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4
| * | | | | | | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-6/+6
|\ \ \ \ \ \ \
| * | | | | | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-6/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+4
|\ \ \ \ \ \ \
| * | | | | | | [ticket/9066] Move regex into get_preg_expression function and add testsJoas Schilling2011-11-141-0/+4
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-5/+29
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-5/+29
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-132-5/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | [ticket/8616] Include old U_INBOX var for BCIgor Wiedler2011-11-111-2/+3
| * | | | | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1