phpbb/tests/template
Nathan Guse bcb1392351 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [feature/oauth] Fix tabindex
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [ticket/11822] Use namespace lookup order for asset loading
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-12 22:56:54 -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 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816 2013-09-12 22:56:54 -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 & 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/11816 2013-09-12 22:56:54 -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