aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-105-8/+8
| | | | | | Replaced the logo with the current one and changed the language strings. PHPBB3-6109
* Merge branch 'develop-olympus' into developIgor Wiedler2011-01-1022-4/+3
|\ | | | | | | This merge commit includes ascraeus-specific renames and adjustments.
| * 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
| |/ | | | | | | PHPBB3-9987
* | Merge branch 'task/acm-refactor' into developIgor Wiedler2011-01-0925-127/+399
|\ \ | | | | | | | | | | | | Conflicts: tests/bootstrap.php
| * | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-0913-117/+76
| | | | | | | | | | | | PHPBB3-9983
| * | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-0923-102/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are now refered to as cache drivers rather than ACM classes. The additional utility functions from the original cache class have been moved to the cache_service. The class loader is now instantiated without a cache instance and passed one as soon as it is constructed to allow autoloading the cache classes. PHPBB3-9983
| * | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-097-16/+16
| | | | | | | | | | | | PHPBB-9979
| * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-092-0/+2
| | | | | | | | | | | | PHPBB3-9981
* | | Merge branch 'ticket/igorw/9979' into developIgor Wiedler2011-01-097-16/+16
|\ \ \ | | | | | | | | | | | | | | | | * ticket/igorw/9979: [ticket/9979] Support autoloading in unit tests
| * | | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-077-16/+16
| | | | | | | | | | | | | | | | PHPBB-9979
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-092-0/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| * develop-olympus: [ticket/9981] Fix unit test dependencies
| * | Merge branch 'ticket/igorw/9981' into develop-olympusIgor Wiedler2011-01-092-0/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/igorw/9981: [ticket/9981] Fix unit test dependencies
| | * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-072-0/+2
| |/ / | | | | | | | | | PHPBB3-9981
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-074-18/+86
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9933] Create unit test for word censor regular expression. [ticket/9933] Move word censor regex into separate function in functions.php [ticket/9933] Wrong handling consecutive multiple asterisks in word censor Conflicts: phpBB/includes/cache.php
| * | Merge branch 'ticket/rxu/9933' into develop-olympusAndreas Fischer2011-01-074-18/+86
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9933: [ticket/9933] Create unit test for word censor regular expression. [ticket/9933] Move word censor regex into separate function in functions.php [ticket/9933] Wrong handling consecutive multiple asterisks in word censor
| | * | [ticket/9933] Create unit test for word censor regular expression.rxu2011-01-071-0/+40
| | | | | | | | | | | | | | | | PHPBB3-9933
| | * | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| | | | | | | | | | | | | | | | PHPBB3-9933
| | * | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
| |/ / | | | | | | | | | | | | | | | Fix consecutive asterisks issue in word censor. PHPBB3-9933
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-071-2/+2
|\ \ \ | |/ / | | / | |/ |/| * develop-olympus: [task/phpdoc] Make phpdoctor output quiet instead of verbose.
| * Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-071-2/+2
| |\ | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Make phpdoctor output quiet instead of verbose.
| | * [task/phpdoc] Make phpdoctor output quiet instead of verbose.Nils Adermann2011-01-071-2/+2
| | | | | | | | | | | | PHPBB3-9943
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-072-105/+150
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [task/phpdoc] Switching from phpDocumentor to phpdoctor.
| * | Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-072-105/+150
| |\ \ | | |/ | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Switching from phpDocumentor to phpdoctor.
| | * [task/phpdoc] Switching from phpDocumentor to phpdoctor.Nils Adermann2011-01-072-105/+150
| | | | | | | | | | | | | | | | | | You can get phpdoctor from https://github.com/peej/phpdoctor PHPBB3-9943
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-0747-678/+128
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also ports all ascraeus tests to the new format. Conflicts: tests/all_tests.php tests/network/all_tests.php tests/request/all_tests.php tests/request/request_var.php tests/template/templates/includephp.html
| * | Merge branch 'task/phpunit-xml' into develop-olympusIgor Wiedler2011-01-0735-506/+103
| |\ \
| | * | [task/phpunit-xml] Manually blacklisting a few PHPUnit classes from backups.Nils Adermann2011-01-072-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blacklisting of these static variables is necessary because code coverage will otherwise consume too much memory. The problem did not exist in earlier PHPUnit versions because all classes beginning with PHPUnit are automatically blacklisted, and code coverage as well as a few other internal classes were still internal parts of PHPunit. These were now moved to PHP_ namespace, causing the problem with backupStaticAttributes. PHPBB3-9967
| | * | [task/phpunit-xml] Only blacklist the tests directory and do not whitelist.Nils Adermann2011-01-071-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would be ideal if we could whitelist the entire phpBB directory or at least includes, but at present that still breaks because of classes with the same name. PHPBB3-9967
| | * | [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.Nils Adermann2011-01-071-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9967
| | * | [task/phpunit-xml] Use phpunit.xml for test suiteIgor Wiedler2011-01-0434-506/+80
| | | | | | | | | | | | | | | | PHPBB3-9967
| * | | Merge branch 'ticket/bantu/9589' into develop-olympusAndreas Fischer2011-01-051-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/bantu/9589: [ticket/9589] nginx.conf.sample -> nginx.sample.conf
| | * | [ticket/9589] nginx.conf.sample -> nginx.sample.confAndreas Fischer2011-01-051-0/+0
| | | | | | | | | | | | | | | | PHPBB3-9589
* | | | Merge branch 'ticket/bantu/9746' into developIgor Wiedler2011-01-038-5/+331
|\ \ \ \
| * | | | [ticket/9746] Adding some more calls to phpbb_ip_normalise().Andreas Fischer2011-01-033-5/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Update documentation of phpbb_inet_pton().Andreas Fischer2011-01-031-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Ease up phpbb_ip_normalise() function.Andreas Fischer2011-01-031-20/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Added PHP implementation of inet_pton and inet_ntop.Marek A. Ruszczyński2011-01-032-7/+136
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().Andreas Fischer2011-01-031-1/+32
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Adding unit tests for inet_ntop() and inet_pton().Andreas Fischer2011-01-032-0/+44
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.Andreas Fischer2011-01-031-0/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-9746
| * | | | [ticket/9746] Adding new function phpbb_ip_normalise().Andreas Fischer2011-01-031-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a function that normalises internet protocol addresses. While there should be no problem at all when handling IPv4 addresses, the many different representations of the exact same IPv6 address and webservers mapping IPv4-addresses into the IPv6 space made it necessary to add such a function. PHPBB3-9746
| * | | | [ticket/9746] Adding tests for phpbb_ip_normalise().Andreas Fischer2011-01-032-0/+67
|/ / / / | | | | | | | | | | | | PHPBB3-9746
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-296-6/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'. [ticket/9953] Set focus to password on re-authentication [ticket/9905] Add SQLite to the DSN description [ticket/9859] Remove years from the credit line.
| * | | Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove years from the credit line.
| | * | | [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9859
| * | | | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9348: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
| | * | | | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode non-ascii characters that might be in default_dateformat. E.g. "d M Y à H:i" PHPBB3-9348
| * | | | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/noxwizard/9953: [ticket/9953] Set focus to password on re-authentication
| | * | | | | [ticket/9953] Set focus to password on re-authenticationPatrick Webster2010-12-282-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the login focus to the password field when prompting for admin re-authentication, rather than the username field. PHPBB3-9953
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-22 09:00:30 +0000