phpbb/phpBB/adm
Nathaniel Guse f08330f762 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig
# By Dhruv (7) and others
# Via Andreas Fischer (7) and others
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11593] initialize $is_expr as null before being passed to get_varref
  [ticket/9341] Assert that page doesnt contain next or prev page posts
  [ticket/9341] Follow the Next/Prev link in tests follow the next/prev link and then assert if the page contains its last post or not
  [ticket/9341] remove PREV_PAGE tpl var used for backward compatability
  [ticket/11618] Replace glob() with scandir() and string matching
  [ticket/9341] Add tests for checking Next and Previous template vars
  [ticket/9341] Move create_topic and post into functional test case
  [ticket/11615] Fix typo in creation_test
  [ticket/11615] Remove magic number in creation_test
  [ticket/11615] Rename class in file to match
  [ticket/11615] Rename init_test to creation_test for clarity
  [ticket/9341] Use U_PREVIOUS and U_NEXT in template files
  [ticket/9341] Correctly named template vars

Conflicts:
	tests/template/template_test_case.php
2013-07-01 12:03:24 -05:00
..
images Merge branch 'develop-olympus' into develop 2012-07-01 00:20:04 +02:00
style Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 2013-07-01 12:03:24 -05:00
index.php [ticket/11549] Do not set extension dir path for style in adm/index.php 2013-05-31 00:18:39 +02:00
swatch.php Merge PR #1130 branch 'EXreaction/ticket/11259' into develop 2012-12-29 13:45:40 -05:00