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
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
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
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
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
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
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
Richard Foote
90c8803d59
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
...
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
2010-12-28 21:33:34 +01:00
Patrick Webster
7f0f08bcc4
[ticket/9953] Set focus to password on re-authentication
...
Sets the login focus to the password field when prompting for admin
re-authentication, rather than the username field.
PHPBB3-9953
2010-12-28 21:26:55 +01:00
Patrick Webster
4c076bfdc1
[ticket/9905] Add SQLite to the DSN description
...
The installer's DSN field has additional meanings for ODBC, PostgreSQL, and
SQLite, but only the first two are mentioned. SQLite uses it for the file path.
PHPBB3-9905
2010-12-28 21:21:16 +01:00
Andreas Fischer
c298c9d6d0
Merge branch 'ticket/igorw/9937' into develop-olympus
...
* ticket/igorw/9937:
[ticket/9937] Make sure feed icon only shows for FORUM_POST
2010-12-21 22:50:39 +01:00
Igor Wiedler
cdbb609c20
[ticket/9937] Make sure feed icon only shows for FORUM_POST
...
This is cleaner, since feed.php only supports FORUM_POST.
PHPBB3-9937
2010-12-21 22:44:10 +01:00
Igor Wiedler
ea3d755962
Merge branch 'ticket/rmcgirr83/9937' into develop-olympus
...
* ticket/rmcgirr83/9937:
[ticket/9937] The feed icon displays on External links...which we don't want
2010-12-21 20:59:52 +01:00
RMcGirr83
3f27cb2ea7
[ticket/9937] The feed icon displays on External links...which we don't want
...
PHPBB3-9937
2010-12-21 20:44:20 +01:00
Igor Wiedler
c1d6aceb03
Merge branch 'ticket/marc1706/9925' into develop-olympus
...
* ticket/marc1706/9925:
[ticket/9925] prosilver logo margin bug in IE 6-7-8
2010-12-21 20:30:24 +01:00
Marc Alexander
d1cf7ff24a
[ticket/9925] prosilver logo margin bug in IE 6-7-8
...
PHPBB3-9925
2010-12-19 17:31:02 +01:00
Andreas Fischer
fc9516a2e3
[ticket/9859] Remove years from the credit line.
...
PHPBB3-9859
2010-12-16 01:19:40 +01:00
Nils Adermann
5e258a0a90
Merge branch 'ticket/igorw/9924' into develop-olympus
...
* ticket/igorw/9924:
[ticket/9924] Pass template instance into $template->display hook
2010-12-13 17:21:57 +01:00
Nils Adermann
5d8ddc7480
Merge branch 'ticket/adamreyher/9928' into develop-olympus
...
* ticket/adamreyher/9928:
[ticket/9928] Do not link "login to your board" to the "send statistics" page.
2010-12-13 17:09:56 +01:00
Andreas Fischer
b1c594229e
Merge branch 'task/naderman/phpdoc' into develop-olympus
...
* task/naderman/phpdoc:
[task/phpdoc] Added a phpdoc task to the build process
[task/phpdoc] Added a configuration file for phpDocumentor.
2010-12-13 15:08:24 +01:00
Andreas Fischer
7c9002398a
Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympus
...
* feature/ChrisTX/acm-wincache:
[feature/acm-wincache] Adding caching module for WinCache's User Cache.
2010-12-13 15:05:22 +01:00
Andreas Fischer
2c25a4bbb2
Merge branch 'ticket/rxu/9851' into develop-olympus
...
* ticket/rxu/9851:
[ticket/9851] "Search new posts" should require login.
2010-12-13 15:03:54 +01:00
rxu
b88582199d
[ticket/9851] "Search new posts" should require login.
...
The newposts search uses user_lastvisit, so it should require user to log in.
PHPBB3-9851
2010-12-13 14:58:43 +01:00
Nils Adermann
03c52e79b9
[task/phpdoc] Added a phpdoc task to the build process
...
PHPBB3-9943
2010-12-13 14:24:33 +01:00
Nils Adermann
41184e5d76
[task/phpdoc] Added a configuration file for phpDocumentor.
...
PHPBB3-9943
2010-12-13 14:22:45 +01:00
ChrisTX
d7287ec633
[feature/acm-wincache] Adding caching module for WinCache's User Cache.
...
PHPBB3-9942
2010-12-13 00:14:57 +01:00
Chris Smith
500f0c05db
Merge branch 'ticket/igorw/9939' into develop-olympus
...
* ticket/igorw/9939:
[ticket/9939] Fix JavaScript error in admin recaptcha template
2010-12-05 13:45:24 +00:00
Igor Wiedler
7dd06e8113
[ticket/9939] Fix JavaScript error in admin recaptcha template
...
PHPBB3-9939
2010-12-05 14:35:19 +01:00
Igor Wiedler
f6a48b495e
Merge branch 'ticket/adamreyher/9575' into develop-olympus
...
* ticket/adamreyher/9575:
[ticket/9575] Also change 'administrate' to 'administer' in templates
[ticket/9575] Change 'administrate' to 'administer'
2010-12-05 14:10:49 +01:00
Igor Wiedler
0491bfbc2d
[ticket/9575] Also change 'administrate' to 'administer' in templates
...
PHPBB3-9575
2010-12-05 14:09:39 +01:00
Igor Wiedler
5a4938c270
Merge branch 'ticket/rmgcirr83/8736' into develop-olympus
...
* ticket/rmgcirr83/8736:
[ticket/8736] guest can have 255 chars long username
2010-12-05 13:51:09 +01:00
RMcGirr83
7a3d6a8168
[ticket/8736] guest can have 255 chars long username
...
when you post as a guest (anonymous) you can fill the field username with 255
chars. that will destroy the prosilver and subsilver2 style at viewtopic.
settings for username in ACP: 6-16 Chars
PHPBB3-8736
2010-12-04 20:04:10 +01:00
Adam Reyher
e6a6f00562
[ticket/9928] Do not link "login to your board" to the "send statistics" page.
...
PHPBB3-9928
2010-12-03 02:15:50 +01:00
Andreas Fischer
e80253209f
Merge branch 'ticket/nickvergessen/9930' into develop-olympus
...
* ticket/nickvergessen/9930:
[ticket/9930] Redirect failes with open_basedir enabled.
2010-12-03 01:41:43 +01:00