10521 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Igor Wiedler	eda9fbbb63	[ticket/9574] Remove conditional PHP<5.2 code ... There is a large amount of conditional code for PHP < 5.2 that can be removed with phpBB 3.1. PHPBB3-9574	2010-12-28 22:36:25 +01:00
Igor Wiedler	1e59666ee3	[ticket/9574] Drop fallback implementations ... phpBB 3.0 includes fallback implementations for following PHP5+ functions: array_combine str_split stripos htmlspecialchars_decode Since phpBB 3.1 requires PHP 5.2+ these can be dropped. PHPBB3-9574	2010-12-28 22:36:25 +01:00
Andreas Fischer	34a1b044a1	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/9937] Make sure feed icon only shows for FORUM_POST [ticket/9937] The feed icon displays on External links...which we don't want [ticket/9925] prosilver logo margin bug in IE 6-7-8	2010-12-21 22:52:28 +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	442fc61be7	Merge branch 'feature/igorw/request-class' into develop ... * feature/igorw/request-class: [feature/request-class] Convert some remaining cookies [feature/request-class] Adjust misleading comment [feature/request-class] Remove direct access to _REQUEST in acp_search [feature/request-class] Special case of direct access to _REQUEST	2010-12-16 02:22:17 +01:00
Nils Adermann	8b9b1f1187	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/9924] Pass template instance into $template->display hook	2010-12-13 17:22:05 +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	18f74a7e10	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs	2010-12-13 17:14:36 +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
Nils Adermann	adfa1656fb	Merge branch 'ticket/igorw/9556' into develop ... * ticket/igorw/9556: [ticket/9556] Drop php closing tags, add trailing newline Conflicts: phpBB/includes/constants.php	2010-12-13 16:35:55 +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
Andreas Fischer	b86289fdd3	Merge branch 'ticket/igorw/9910' into develop-olympus ... * ticket/igorw/9910: [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs	2010-12-03 01:40:38 +01:00
Andreas Fischer	59d4e905ba	Merge branch 'ticket/igorw/9932' into develop-olympus ... * ticket/igorw/9932: [ticket/9932] Add the Bing bot when converting	2010-12-03 01:38:34 +01:00
Andreas Fischer	bbde10b410	Merge branch 'ticket/mungo/9921' into develop-olympus ... * ticket/mungo/9921: [ticket/9921] Adding sample configuration file for the lighttpd webserver.	2010-12-03 01:37:27 +01:00
Adam Reyher	8b3d068e83	[ticket/9575] Change 'administrate' to 'administer' ... PHPBB3-9575	2010-12-01 14:14:46 -05:00
Ingo Migliarina	b017f54ac9	[ticket/9921] Adding sample configuration file for the lighttpd webserver. ... PHPBB3-9921	2010-12-01 18:39:50 +01:00
Igor Wiedler	bd579c8374	Merge branch 'develop-olympus' into develop	2010-11-29 20:16:45 +01:00
Igor Wiedler	84c59a1c20	Merge branch 'task/github-readme' into develop-olympus	2010-11-29 20:16:36 +01:00
Igor Wiedler	90ff30b7a0	[task/github-readme] Add README file for GitHub ... PHPBB3-9788	2010-11-29 20:15:58 +01:00
Richard Foote	23765fa668	[ticket/9932] Add the Bing bot when converting ... PHPBB3-9932	2010-11-29 08:33:10 +01:00
Joas Schilling	5ec1c88795	[ticket/9930] Redirect failes with open_basedir enabled. ... Open_basedir does not allow file_exists() for "." and directories without a trayling-slash. Therefor we must append it on the check. PHPBB3-9930	2010-11-25 23:29:12 +01:00
Igor Wiedler	053cf790a9	[ticket/9924] Pass template instance into $template->display hook ... PHPBB3-9924	2010-11-23 16:09:09 +01:00
Igor Wiedler	f204ce6825	Merge branch 'ticket/rmcgirr83/9897' into develop-olympus	2010-11-21 23:48:17 +01:00
RMcGirr83	7e934c6362	[ticket/9897] A few language fixes ... PHPBB3-9897	2010-11-21 23:46:09 +01:00
Igor Wiedler	217e77d16b	[ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs ... PHPBB3-9910	2010-11-21 23:18:09 +01:00
Nils Adermann	67593824d4	Merge branch 'develop-olympus' into develop ... * develop-olympus: [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.	2010-11-20 17:56:17 +01:00
Nils Adermann	d2778e67ea	Merge branch 'prep-release-3.0.8' into develop-olympus ... * prep-release-3.0.8: [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2010-11-20 17:55:56 +01:00
Nils Adermann	af4c2a3eb1	[prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog release-3.0.8	2010-11-19 13:22:36 +01:00
Nils Adermann	2831a3a9a9	Merge branch 'ticket/9903' into prep-release-3.0.8 ... * ticket/9903: [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode.	2010-11-19 11:33:14 +01:00
Igor Wiedler	49b639dd95	[ticket/9903] Script for detecting potentially malicious flash bbcodes ... PHPBB3-9903	2010-11-19 11:31:00 +01:00
Nils Adermann	bce138ca14	Merge branch 'ticket/igorw/9904' into prep-release-3.0.8 ... * ticket/igorw/9904: [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.	2010-11-19 11:27:57 +01:00