Andreas Fischer b4183eda0c Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php		2013-06-11 18:46:30 +02:00
..
adm	Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop	2013-06-06 14:07:27 -05:00
assets/javascript	Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop	2013-06-06 14:07:27 -05:00
cache	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
config	[ticket/11481] Remove globals and use dependency injection instead	2013-06-06 20:32:47 +02:00
develop	[ticket/11413] Undo editing the user_notifications table	2013-04-29 21:22:07 -05:00
docs	Merge branch 'develop-olympus' into develop	2013-06-03 15:05:09 +02:00
download	[ticket/11144] Add missing {FORUM_NAME} variable	2013-05-06 21:31:16 +02:00
files	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
images	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
includes	Merge branch 'develop-olympus' into develop	2013-06-11 18:46:30 +02:00
install	Merge branch 'develop-olympus' into develop	2013-06-06 12:56:36 -05:00
language	Merge branch 'develop-olympus' into develop	2013-06-05 01:55:49 +05:30
store	[ticket/9520] Removed per directory web.config files.	2010-05-03 19:31:40 +02:00
styles	Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop	2013-06-06 14:07:27 -05:00
.htaccess	[feature/controller] Remove url rewriting until we use pathinfo in controllers	2012-11-18 13:32:54 -05:00
app.php	[feature/controller] Check for proper status codes from controllers	2012-11-19 12:37:20 -05:00
common.php	[ticket/11335] Replace "$phpEx" with $phpEx	2013-04-24 20:39:24 -05:00
composer.json	Merge branch 'develop-olympus' into develop	2013-05-09 19:42:13 +02:00
composer.lock	Merge branch 'develop-olympus' into develop	2013-05-09 19:42:13 +02:00
cron.php	[ticket/11189] Replace DEBUG_EXTRA with DEBUG	2012-11-10 10:45:02 -06:00
faq.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
feed.php	[ticket/11481] Move prepended slash from calls into function	2013-06-06 20:35:38 +02:00
index.php	[ticket/11103] Instantiate $phpbb_notifications as needed	2012-12-13 19:19:40 -06:00
mcp.php	[ticket/9975] Moved a few E_USER_ERROR errors to /language	2013-04-23 09:55:36 -07:00
memberlist.php	[ticket/11454] Use set_addresses in other applicable areas	2013-04-24 15:34:12 -05:00
posting.php	Merge branch 'develop-olympus' into develop	2013-05-06 22:11:33 +02:00
report.php	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103	2013-01-15 11:31:39 -06:00
search.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
ucp.php	[ticket/10679] Use module_auth to limit access to the module	2012-12-06 16:33:12 +01:00
viewforum.php	[ticket/10954] Change behavior of marking topics/forums	2012-12-14 15:46:45 +01:00
viewonline.php	[ticket/11259] adm_relative_path -> phpbb_adm_relative_path	2012-12-09 19:29:51 -06:00
viewtopic.php	[ticket/11201] Revert WLM dropping because it is still used in China.	2013-02-04 01:31:43 +01:00
web.config	[feature/controller] Remove URL rewriting by default	2012-11-16 17:06:02 -05:00