aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [feature/system-cron] WIP on making cron tasks runnable via system cronOleg Pudeyev2011-02-124-32/+373
* Merge branch 'develop-olympus' into developIgor Wiedler2011-02-121-1/+7
|\
| * Merge branch 'ticket/p/10029' into develop-olympusAndreas Fischer2011-02-101-1/+7
| |\
| | * [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.Oleg Pudeyev2011-02-091-1/+7
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-071-0/+1
|\ \ \ | |/ /
| * | Merge branch 'ticket/nickvergessen/9949' into develop-olympusAndreas Fischer2011-02-071-0/+1
| |\ \
| | * | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-041-6/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| | |/
* | | Merge branch 'ticket/nickvergessen/9823' into developAndreas Fischer2011-02-041-0/+550
|\ \ \
| * | | [ticket/9823] Unit tests for validate_config_vars.Joas Schilling2011-02-011-2/+2
| * | | [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-011-0/+546
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-011-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
| |\ \
| | * | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| | |/
* | | [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-301-0/+9
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-301-2/+2
|\ \ \ | |/ /
| * | [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-231-2/+3
|\ \ | |/
| * [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
* | Merge branch 'ticket/bantu/9790' into developIgor Wiedler2011-01-181-20/+37
|\ \
| * | [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.Andreas Fischer2011-01-181-15/+8
| * | [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.Andreas Fischer2011-01-171-0/+10
| * | [ticket/9790] Always call file_gc(false) before sending the file.Andreas Fischer2011-01-171-3/+4
| * | [ticket/9790] Add $exit parameter to file_gc().Andreas Fischer2011-01-171-2/+15
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-162-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-162-2/+2
| |\ \
| | * | [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-162-2/+2
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-161-19/+11
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| * | [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().Andreas Fischer2011-01-161-6/+7
| * | [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
| |/
* | Merge branch 'task/naderman/config-class' into developAndreas Fischer2011-01-128-107/+476
|\ \
| * | [task/config-class] Do not create multiple cache driver instances.Nils Adermann2011-01-121-23/+42
| * | [task/config-class] Add an attribute for the table name in phpbb_config_db.Nils Adermann2011-01-121-0/+6
| * | [task/config-class] Correctly merge cached config with dynamically loaded data.Nils Adermann2011-01-121-1/+5
| * | [task/config-class] Always specify the config table to use.Nils Adermann2011-01-121-1/+1
| * | [task/config-class] Fix db config constructor param orderIgor Wiedler2011-01-111-2/+2
| * | [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-108-86/+426
* | | [task/acm-refactor] Refactor WinCache ACM moduleIgor Wiedler2011-01-111-7/+1
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-103-4/+4
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'ticket/bantu/9764' into develop-olympusIgor Wiedler2011-01-103-4/+4
| |\
| | * [ticket/9764] Allow $config['mime_triggers'] to be an empty string.Andreas Fischer2010-10-283-4/+4
* | | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-092-26/+17
* | | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-0912-70/+244
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-073-18/+46
|\ \ \ | |/ /
| * | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| * | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
* | | [ticket/9746] Adding some more calls to phpbb_ip_normalise().Andreas Fischer2011-01-031-1/+1