aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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 '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 '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/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
* | | | | Merge branch 'ticket/noxwizard/9905' into develop-olympusAndreas Fischer2010-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * ticket/noxwizard/9905: [ticket/9905] Add SQLite to the DSN description
| * | | | [ticket/9905] Add SQLite to the DSN descriptionPatrick Webster2010-12-281-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'ticket/igorw/9937' into develop-olympusAndreas Fischer2010-12-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9937: [ticket/9937] Make sure feed icon only shows for FORUM_POST
| * | | | [ticket/9937] Make sure feed icon only shows for FORUM_POSTIgor Wiedler2010-12-211-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | This is cleaner, since feed.php only supports FORUM_POST. PHPBB3-9937
* | | | Merge branch 'ticket/rmcgirr83/9937' into develop-olympusIgor Wiedler2010-12-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rmcgirr83/9937: [ticket/9937] The feed icon displays on External links...which we don't want
| * | | | [ticket/9937] The feed icon displays on External links...which we don't wantRMcGirr832010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9937
* | | | | Merge branch 'ticket/marc1706/9925' into develop-olympusIgor Wiedler2010-12-211-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * ticket/marc1706/9925: [ticket/9925] prosilver logo margin bug in IE 6-7-8
| * | | | [ticket/9925] prosilver logo margin bug in IE 6-7-8Marc Alexander2010-12-191-0/+9
|/ / / / | | | | | | | | | | | | PHPBB3-9925
* | | | Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-132-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9924: [ticket/9924] Pass template instance into $template->display hook
| * | | | [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-232-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9924
* | | | | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9928: [ticket/9928] Do not link "login to your board" to the "send statistics" page.
| * | | | | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9928
* | | | | | Merge branch 'task/naderman/phpdoc' into develop-olympusAndreas Fischer2010-12-132-1/+113
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor.
| * | | | | [task/phpdoc] Added a phpdoc task to the build processNils Adermann2010-12-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9943
| * | | | | [task/phpdoc] Added a configuration file for phpDocumentor.Nils Adermann2010-12-131-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9943
* | | | | | Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympusAndreas Fischer2010-12-131-0/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/ChrisTX/acm-wincache: [feature/acm-wincache] Adding caching module for WinCache's User Cache.
| * | | | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9942
* | | | | | Merge branch 'ticket/rxu/9851' into develop-olympusAndreas Fischer2010-12-132-22/+35
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * ticket/rxu/9851: [ticket/9851] "Search new posts" should require login.
| * | | | | [ticket/9851] "Search new posts" should require login.rxu2010-12-132-22/+35
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The newposts search uses user_lastvisit, so it should require user to log in. PHPBB3-9851
* | | | | Merge branch 'ticket/igorw/9939' into develop-olympusChris Smith2010-12-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9939: [ticket/9939] Fix JavaScript error in admin recaptcha template
| * | | | | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-9939
* | | | | Merge branch 'ticket/adamreyher/9575' into develop-olympusIgor Wiedler2010-12-055-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9575: [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/9575] Change 'administrate' to 'administer'
| * | | | | [ticket/9575] Also change 'administrate' to 'administer' in templatesIgor Wiedler2010-12-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9575
| * | | | | [ticket/9575] Change 'administrate' to 'administer'Adam Reyher2010-12-013-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9575
* | | | | | Merge branch 'ticket/rmgcirr83/8736' into develop-olympusIgor Wiedler2010-12-051-1/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * ticket/rmgcirr83/8736: [ticket/8736] guest can have 255 chars long username
| * | | | | [ticket/8736] guest can have 255 chars long usernameRMcGirr832010-12-041-1/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'ticket/nickvergessen/9930' into develop-olympusAndreas Fischer2010-12-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9930: [ticket/9930] Redirect failes with open_basedir enabled.
| * | | | | [ticket/9930] Redirect failes with open_basedir enabled.Joas Schilling2010-11-251-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Open_basedir does not allow file_exists() for "." and directories without a trayling-slash. Therefor we must append it on the check. PHPBB3-9930
* | | | | Merge branch 'ticket/igorw/9910' into develop-olympusAndreas Fischer2010-12-031-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9910: [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs