aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-01-1628-150/+31
|\
| * Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-1628-150/+31
| |\
| | * [ticket/9859] Remove the years from the copyright statements in docs files.Andreas Fischer2011-01-168-8/+8
| | * [ticket/9859] Remove the year from the copyright meta tag in docs/*.htmlAndreas Fischer2011-01-167-7/+7
| | * [ticket/9859] Remove the meta copyright tag as well.Andreas Fischer2011-01-165-5/+0
| | * [ticket/9859] Remove the credit line comment from all html files.Andreas Fischer2011-01-1611-116/+2
| | * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-1614-14/+14
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-162-21/+23
|\ \ \ | |/ /
| * | Merge branch 'ticket/bantu/9933' into develop-olympusIgor Wiedler2011-01-162-17/+27
| |\ \ | | |/ | |/|
| | * [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-162-8/+19
| | * [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
| |/
* | Merge branch 'task/igorw/acm-refactor' into developChris Smith2011-01-131-1/+1
|\ \
| * | [task/acm-refactor] Remove includes/cache.php from coding guidelinesIgor Wiedler2011-01-131-1/+1
|/ /
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-127-1/+363
|\ \ | |/
| * Merge branch 'ticket/igorw/9990' into develop-olympusNils Adermann2011-01-127-2/+364
| |\
| | * [ticket/9990] Add docs for running slow testsIgor Wiedler2011-01-122-0/+34
| | * [ticket/9990] Integrate utf normalizer tests into test suiteIgor Wiedler2011-01-115-2/+330
* | | Merge branch 'task/naderman/config-class' into developAndreas Fischer2011-01-1220-204/+787
|\ \ \
| * | | [task/config-class] Do not create multiple cache driver instances.Nils Adermann2011-01-126-32/+51
| * | | [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-122-1/+16
| * | | [task/config-class] Always specify the config table to use.Nils Adermann2011-01-128-34/+28
| * | | [task/config-class] Fix db config constructor param orderIgor Wiedler2011-01-112-8/+8
| * | | [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-1020-154/+703
* | | | Merge branch 'task/igorw/acm-refactor' into developAndreas Fischer2011-01-111-7/+1
|\ \ \ \
| * | | | [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
* | | Merge branch 'ticket/nickvergessen/6109' into developIgor Wiedler2011-01-106-8/+8
|\ \ \
| * | | [ticket/6109] WLM subsilver2 button in the english language package.Joas Schilling2011-01-101-0/+0
| * | | [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-105-8/+8
|/ / /
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-1022-4/+3
|\ \ \ | |/ /
| * | Merge branch 'ticket/igorw/9987' into develop-olympusIgor Wiedler2011-01-1015-1/+1
| |\ \
| | * | [ticket/9987] Rename test files to include a _test suffixIgor Wiedler2011-01-1015-1/+1
| |/ /
* | | Merge branch 'task/acm-refactor' into developIgor Wiedler2011-01-0925-127/+399
|\ \ \
| * | | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-0913-117/+76
| * | | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-0923-102/+415
| * | | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-097-16/+16
| * | | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-092-0/+2
* | | | Merge branch 'ticket/igorw/9979' into developIgor Wiedler2011-01-097-16/+16
|\ \ \ \
| * | | | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-077-16/+16
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-092-0/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Merge branch 'ticket/igorw/9981' into develop-olympusIgor Wiedler2011-01-092-0/+2
| |\ \ \
| | * | | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-072-0/+2
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-074-18/+86
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/rxu/9933' into develop-olympusAndreas Fischer2011-01-074-18/+86
| |\ \ \
| | * | | [ticket/9933] Create unit test for word censor regular expression.rxu2011-01-071-0/+40
| | * | | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43