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

..

acp_attachments.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_avatar_options_gravatar.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_avatar_options_local.html

[feature/avatars] Remove not needed inline style

2013-01-08 22:47:05 +01:00

acp_avatar_options_remote.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_avatar_options_upload.html

[ticket/11010] Fix input type for urls

2013-05-20 18:42:10 +02:00

acp_ban.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_bbcodes.html

…

acp_board.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_bots.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_captcha.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_database.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_disallow.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_email.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_ext_details.html

[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.

2012-11-10 00:23:03 +01:00

acp_ext_disable.html

…

acp_ext_enable.html

[feature/migrations] Catch and display errors from the migrator

2013-02-09 21:09:29 -06:00

acp_ext_list.html

…

acp_ext_purge.html

[feature/migrations] Catch and display errors from the migrator

2013-02-09 21:09:29 -06:00

acp_forums_copy_perm.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_forums.html

[feature/twig] Fix improper template syntax in acp_forums.html

2013-06-14 09:35:36 -05:00

acp_groups_position.html

[ticket/10411] Remove ajax delete, so the page is refreshed

2013-03-01 12:45:49 +01:00

acp_groups.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_icons.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

acp_inactive.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_jabber.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_language.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_logs.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_main.html

[feature/events] Fix names of events in adm/style/acp_main.html

2012-12-17 11:37:38 -05:00

acp_modules.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_permission_roles.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_permissions.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_php_info.html

…

acp_profile.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_prune_forums.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_prune_users.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_ranks.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_reasons.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_search.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

acp_send_statistics.html

…

acp_styles.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_update.html

…

acp_users_avatar.html

[feature/avatars] Minor variable naming fixes

2012-12-04 00:49:37 +01:00

acp_users_feedback.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_users_overview.html

[ticket/11010] Changing email and url types in adm templates

2013-05-20 18:39:53 +02:00

acp_users_prefs.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_users_profile.html

[ticket/11010] Fix email inputs

2013-05-20 18:42:09 +02:00

acp_users_signature.html

[feature/editor-code-tabs] Apply code editor to everything

2013-05-20 20:29:37 +03:00

acp_users_warnings.html

…

acp_users.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

acp_words.html

…

admin.css

[ticket/11166] Add ajaxify support to normal ACP confirm_box()

2013-03-03 17:34:01 +01:00

ajax.js

[ticket/10741] Do not resize textarea.no-auto-resize

2013-04-12 16:46:54 +03:00

avatars.js

[feature/avatars] Change avatar javascript to conform to new coding guidelines

2013-01-04 18:13:49 +01:00

captcha_default_acp_demo.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_gd_acp.html

[ticket/11010] Fixes for number input in acp

2013-05-20 18:42:11 +02:00

captcha_qa_acp_demo.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_qa_acp.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_recaptcha_acp.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_recaptcha.html

…

colour_swatch.html

…

confirm_bbcode.html

…

confirm_body_prune.html

…

confirm_body.html

[ticket/11166] Add ajaxify support to normal ACP confirm_box()

2013-03-03 17:34:01 +01:00

custom_profile_fields.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

editor.js

[ticket/11314] Modify files to comply with coding standards

2013-03-26 13:13:33 +01:00

install_convert.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

install_error.html

…

install_footer.html

…

install_header.html

[ticket/11259] Make phpbb_admin_path available everywhere

2012-12-09 17:01:08 -06:00

install_install.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

install_main.html

…

install_update_diff.html

[ticket/11259] Make phpbb_admin_path available everywhere

2012-12-09 17:01:08 -06:00

install_update.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

message_body.html

…

overall_footer.html

[ticket/11279] Clearer AJAX errors

2013-05-20 21:35:51 +03:00

overall_header.html

[feature/events] Append "_append" to acp_overall_header_head

2012-12-17 11:37:42 -05:00

pagination.html

…

permission_forum_copy.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

permission_mask.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

permission_roles_mask.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

permission_trace.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

permissions.js

[ticket/11314] Modify files to comply with coding standards

2013-03-26 13:13:33 +01:00

progress_bar.html

…

simple_body.html

…

simple_footer.html

[feature/events] acp_simple_footer_end -> acp_simple_footer_after

2012-12-17 11:37:43 -05:00

simple_header.html

[feature/events] Append "_append" to acp_simple_header_head

2012-12-17 11:37:44 -05:00

timezone_option.html

[ticket/10780] Replace colon usage in adm template output with {L_COLON}

2012-11-10 00:23:03 +01:00

timezone.js

[ticket/11314] Add missing "use strict" to timezone.js files

2013-01-10 11:15:19 +01:00

tooltip.js

[ticket/11314] Modify files to comply with coding standards

2013-03-26 13:13:33 +01:00

viewsource.html

…