1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

10581 Commits

Author SHA1 Message Date
Igor Wiedler
5ea59ba322 Merge branch 'ticket/nickvergessen/6109' into develop
* ticket/nickvergessen/6109:
  [ticket/6109] WLM subsilver2 button in the english language package.
  [ticket/6109] MSN is now called Windows Live Messenger (WLM)
2011-01-10 01:52:56 +01:00
Joas Schilling
6f9e3d3b96 [ticket/6109] WLM subsilver2 button in the english language package.
PHPBB3-6109
2011-01-10 01:45:28 +01:00
Joas Schilling
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +01:00
Igor Wiedler
b5c8349f4a Merge branch 'develop-olympus' into develop
This merge commit includes ascraeus-specific renames and adjustments.
2011-01-10 00:37:47 +01:00
Igor Wiedler
d7299f5071 Merge branch 'ticket/igorw/9987' into develop-olympus 2011-01-10 00:26:39 +01:00
Igor Wiedler
01fe91c5c4 [ticket/9987] Rename test files to include a _test suffix
PHPBB3-9987
2011-01-10 00:18:37 +01:00
Igor Wiedler
95c683056b Merge branch 'task/acm-refactor' into develop
Conflicts:
	tests/bootstrap.php
2011-01-09 23:58:27 +01:00
Nils Adermann
1aef7eb20e [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.
PHPBB3-9983
2011-01-09 23:49:44 +01:00
Igor Wiedler
9329b16ab1 [task/acm-refactor] Refactor the ACM classes to have a common interface.
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
2011-01-09 23:49:35 +01:00
Igor Wiedler
36e95f939d [ticket/9979] Support autoloading in unit tests
PHPBB-9979
2011-01-09 23:48:40 +01:00
Igor Wiedler
7129531bc0 [ticket/9981] Fix unit test dependencies
PHPBB3-9981
2011-01-09 23:48:39 +01:00
Igor Wiedler
5373f8157d Merge branch 'ticket/igorw/9979' into develop
* ticket/igorw/9979:
  [ticket/9979] Support autoloading in unit tests
2011-01-09 23:12:41 +01:00
Igor Wiedler
c1950004b4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9981] Fix unit test dependencies
2011-01-09 23:11:58 +01:00
Igor Wiedler
0a945100fd Merge branch 'ticket/igorw/9981' into develop-olympus
* ticket/igorw/9981:
  [ticket/9981] Fix unit test dependencies
2011-01-09 23:11:47 +01:00
Igor Wiedler
69616db1ed [ticket/9981] Fix unit test dependencies
PHPBB3-9981
2011-01-07 22:45:39 +01:00
Igor Wiedler
eb6283ea3d [ticket/9979] Support autoloading in unit tests
PHPBB-9979
2011-01-07 22:17:50 +01:00
Andreas Fischer
1c95101284 Merge branch 'develop-olympus' into develop
* 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
2011-01-07 15:58:10 +01:00
Andreas Fischer
a469e80493 Merge branch 'ticket/rxu/9933' into develop-olympus
* 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
2011-01-07 15:41:12 +01:00
rxu
95cf47c4ef [ticket/9933] Create unit test for word censor regular expression.
PHPBB3-9933
2011-01-07 15:32:42 +01:00
rxu
951b7b22e0 [ticket/9933] Move word censor regex into separate function in functions.php
PHPBB3-9933
2011-01-07 15:32:34 +01:00
rxu
9a25e4ad89 [ticket/9933] Wrong handling consecutive multiple asterisks in word censor
Fix consecutive asterisks issue in word censor.

PHPBB3-9933
2011-01-07 20:51:43 +07:00
Nils Adermann
08f6a12325 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/phpdoc] Make phpdoctor output quiet instead of verbose.
2011-01-07 14:22:29 +01:00
Nils Adermann
7a2348bf7f Merge branch 'task/naderman/phpdoc' into develop-olympus
* task/naderman/phpdoc:
  [task/phpdoc] Make phpdoctor output quiet instead of verbose.
2011-01-07 14:22:15 +01:00
Nils Adermann
c3fe0d99f9 [task/phpdoc] Make phpdoctor output quiet instead of verbose.
PHPBB3-9943
2011-01-07 14:15:45 +01:00
Nils Adermann
df9971d883 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/phpdoc] Switching from phpDocumentor to phpdoctor.
2011-01-07 02:28:54 +01:00
Nils Adermann
480978db41 Merge branch 'task/naderman/phpdoc' into develop-olympus
* task/naderman/phpdoc:
  [task/phpdoc] Switching from phpDocumentor to phpdoctor.
2011-01-07 02:27:57 +01:00
Nils Adermann
a1731d5e6e [task/phpdoc] Switching from phpDocumentor to phpdoctor.
You can get phpdoctor from https://github.com/peej/phpdoctor

PHPBB3-9943
2011-01-07 02:25:06 +01:00
Igor Wiedler
14a84cf89c Merge branch 'develop-olympus' into develop
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
2011-01-07 01:39:59 +01:00
Igor Wiedler
5b752a2fed Merge branch 'task/phpunit-xml' into develop-olympus 2011-01-07 01:15:06 +01:00
Nils Adermann
b48b909773 [task/phpunit-xml] Manually blacklisting a few PHPUnit classes from backups.
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
2011-01-07 01:07:30 +01:00
Nils Adermann
b4f95deefc [task/phpunit-xml] Only blacklist the tests directory and do not whitelist.
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
2011-01-07 00:30:38 +01:00
Nils Adermann
b720edb05b [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.
PHPBB3-9967
2011-01-07 00:19:00 +01:00
Andreas Fischer
d968d35271 Merge branch 'ticket/bantu/9589' into develop-olympus
* ticket/bantu/9589:
  [ticket/9589] nginx.conf.sample -> nginx.sample.conf
2011-01-05 00:41:37 +01:00
Andreas Fischer
cdeffdd59f [ticket/9589] nginx.conf.sample -> nginx.sample.conf
PHPBB3-9589
2011-01-05 00:40:07 +01:00
Igor Wiedler
9a52bd0301 [task/phpunit-xml] Use phpunit.xml for test suite
PHPBB3-9967
2011-01-04 22:54:01 +01:00
Igor Wiedler
da4617b14b Merge branch 'ticket/bantu/9746' into develop 2011-01-03 00:24:55 +01:00
Andreas Fischer
3c713b5e7d [ticket/9746] Adding some more calls to phpbb_ip_normalise().
PHPBB3-9746
2011-01-03 00:09:52 +01:00
Andreas Fischer
5d01c58b77 [ticket/9746] Update documentation of phpbb_inet_pton().
PHPBB3-9746
2011-01-03 00:09:52 +01:00
Andreas Fischer
985151913c [ticket/9746] Ease up phpbb_ip_normalise() function.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Marek A. Ruszczyński
2aa54bb156 [ticket/9746] Added PHP implementation of inet_pton and inet_ntop.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
ae43221399 [ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
fdb5c2c990 [ticket/9746] Adding unit tests for inet_ntop() and inet_pton().
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
6a32724400 [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.
PHPBB3-9746
2011-01-03 00:09:51 +01:00
Andreas Fischer
8032549a15 [ticket/9746] Adding new function phpbb_ip_normalise().
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
2011-01-03 00:09:51 +01:00
Andreas Fischer
dc7e3550ab [ticket/9746] Adding tests for phpbb_ip_normalise().
PHPBB3-9746
2011-01-03 00:09:40 +01:00
Andreas Fischer
979158f0a2 Merge branch 'develop-olympus' into develop
* 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.
2010-12-29 23:01:19 +01:00
Andreas Fischer
c54683be8c Merge branch 'ticket/bantu/9859' into develop-olympus
* ticket/bantu/9859:
  [ticket/9859] Remove years from the credit line.
2010-12-29 22:56:55 +01:00
Andreas Fischer
54ef781d72 Merge branch 'ticket/bantu/9348' into develop-olympus
* ticket/bantu/9348:
  [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
2010-12-29 22:56:48 +01:00
Andreas Fischer
410f1fdbc0 Merge branch 'ticket/noxwizard/9953' into develop-olympus
* ticket/noxwizard/9953:
  [ticket/9953] Set focus to password on re-authentication
2010-12-29 22:56:40 +01:00
Andreas Fischer
7442cd214c Merge branch 'ticket/noxwizard/9905' into develop-olympus
* ticket/noxwizard/9905:
  [ticket/9905] Add SQLite to the DSN description
2010-12-29 22:56:30 +01:00