phpbb/tests/template
Nathan Guse 68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00
..
datasets [ticket/11784] Remove naming redundancy for event listeners 2013-08-13 02:14:22 -07:00
parent_templates [ticket/11388] INCLUDECSS 2013-07-11 15:31:55 -05:00
subdir [feature/twig] Fix includephp_from_subdir_test.php 2013-07-01 13:06:37 -05:00
templates [ticket/11701] Fix loops var check 2013-07-23 09:26:50 -05:00
includephp_test.php [ticket/11628] Remove template_path option on set_custom_style 2013-07-24 13:25:20 -05:00
template_events_test.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628 2013-08-28 13:30:48 -05:00
template_includecss_test.php [ticket/11388] INCLUDECSS 2013-07-11 15:31:55 -05:00
template_includejs_test.php [ticket/11647] Always use &amp; for URLs 2013-07-11 18:13:48 -04:00
template_inheritance_test.php [feature/twig] Correct template_inheritance_test.php 2013-06-24 22:44:12 -05:00
template_parser_test.php [ticket/11665] Fix test class name 2013-07-12 12:10:57 -05:00
template_test.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628 2013-08-28 13:30:48 -05:00
template_test_case.php [ticket/11628] Remove template_path option on set_custom_style 2013-07-24 13:25:20 -05:00
template_test_case_with_tree.php [ticket/11628] Remove template_path option on set_custom_style 2013-07-24 13:25:20 -05:00